Development August 2024

development@lists.ipfire.org

9 participants
58 discussions

[PATCH v2] collectd: Fixes bug-13074, create collectd.d directory
by Adolf Belka 07 Aug '24

07 Aug '24

- As requested in bug 13074, create a collectd.d directory to enable any addon definitions to be created. - Added include statement in conf file to load everything that is stored in the collectd.d directory. - collectd.precache and collectd.thermal have been left in their original locations - Removed the arm section in the initscript as only aarch64 is now used. - Modified the lfs to create the collectd.d directory - Removal of collectd.custom file as this was the previous way to define custom collectd profiles but would have been overwritten by any update of collectd. - Update of rootfile to take account of new path and removal of collectd.custom - Tested out in vm testbed with Core Update 188 and all existing graphs were still created and updated. From my evaluation the changes have not affected anything. - The creation of the collectd.d directory now allows users to add their own desired profiles but also if it is decided that an addon should be included in the processes graph, or if a new graph for addons is created then profiles for that addon can be placed in the collectd.d directory and will be automatically included by collectd. Fixes: Bug13074 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/collectd/collectd.conf | 2 +- config/collectd/collectd.custom | 1 - config/rootfiles/common/collectd | 2 +- lfs/collectd | 3 ++- src/initscripts/system/collectd | 5 +---- 5 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 config/collectd/collectd.custom diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 27e1fe984..e51d9108b 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -74,5 +74,5 @@ include "/etc/collectd.precache" </Plugin> #include "/etc/collectd.thermal" -include "/etc/collectd.custom" include "/etc/collectd.vpn" +include "/etc/collectd.d/*" diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.custom deleted file mode 100644 index 7443bf3e6..000000000 --- a/config/collectd/collectd.custom +++ /dev/null @@ -1 +0,0 @@ -# Use this file to add custom configs and rules for collectd diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 65408dc7f..c8a3ad607 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -1,8 +1,8 @@ etc/collectd.conf -etc/collectd.custom etc/collectd.precache etc/collectd.thermal etc/collectd.vpn +etc/collectd.d etc/rc.d/rc0.d/K50collectd etc/rc.d/rc3.d/S29collectd etc/rc.d/rc6.d/K50collectd diff --git a/lfs/collectd b/lfs/collectd index 24f5bc632..6d0f666f6 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -125,6 +125,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-librrd=/usr/share/rrdtool-1.2.30 \ --with-fp-layout=nothing cd $(DIR_APP) && make install #collectd-4 does not support parallel build + mkdir /etc/collectd.d cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn chown nobody.nobody /var/ipfire/ovpn/collectd.vpn diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 56b799d56..263511fc7 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -68,9 +68,6 @@ case "$1" in # ARM does not support to scan for sensors. In that case, # we create an empty configuration file. machine=$(uname -m) - if [ "${machine:0:3}" = "arm" ]; then - touch /etc/sysconfig/lm_sensors - fi if [ "${machine:0:7}" = "aarch64" ]; then touch /etc/sysconfig/lm_sensors fi -- 2.45.2

1 0

Build fails at cdrom stage
by Adolf Belka 07 Aug '24

07 Aug '24

Hi All, My CU188 build is failing at the cdrom stage. The message it comes up with is BUILD_ARCH="x86_64" BUILDTARGET="x86_64-pc-linux-gnu" KVER="6.6.32" /usr/src/src/scripts/archive.files x86_64 /usr/src/config/rootfiles/common | tee | tar --create --format=pax --acls --xattrs --xattrs-include='*' --sparse --directory=/ --exclude="dev/pts/*" --exclude="proc/*" --exclude="tmp/*" --exclude="__pycache__" --files-from=- | tar --extract --format=pax --acls --xattrs --xattrs-include='*' --sparse --directory=/tmp/root tar: usr/bin/br2684ctl: Cannot stat: No such file or directory tar: Exiting with failure status due to previous errors For some reason it is looking for br2684ctl in /usr/bin/ but that file is located in /usr/sbin/ I can't figure out why it is looking in bin rather than in sbin but that seems to be the reason for the failure Regards, Adolf.

2 5

[PATCH] hostapd: Update to version 2_11
by Adolf Belka 07 Aug '24

07 Aug '24

- Update from version 2_10 to 2_11 - Update of rootfile not required - Update of patches to latest source tarball - Changelog 2_11 * Wi-Fi Easy Connect - add support for DPP release 3 - allow Configurator parameters to be provided during config exchange * HE/IEEE 802.11ax/Wi-Fi 6 - various fixes * EHT/IEEE 802.11be/Wi-Fi 7 - add preliminary support * SAE: add support for fetching the password from a RADIUS server * support OpenSSL 3.0 API changes * support background radar detection and CAC with some additional drivers * support RADIUS ACL/PSK check during 4-way handshake (wpa_psk_radius=3) * EAP-SIM/AKA: support IMSI privacy * improve 4-way handshake operations - use Secure=1 in message 3 during PTK rekeying * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases to avoid interoperability issues * support new SAE AKM suites with variable length keys * support new AKM for 802.1X/EAP with SHA384 * extend PASN support for secure ranging * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) - this is based on additional details being added in the IEEE 802.11 standard - the new implementation is not backwards compatible * improved ACS to cover additional channel types/bandwidths * extended Multiple BSSID support * fix beacon protection with FT protocol (incorrect BIGTK was provided) * support unsynchronized service discovery (USD) * add preliminary support for RADIUS/TLS * add support for explicit SSID protection in 4-way handshake (a mitigation for CVE-2023-52424; disabled by default for now, can be enabled with ssid_protection=1) * fix SAE H2E rejected groups validation to avoid downgrade attacks * use stricter validation for some RADIUS messages * a large number of other fixes, cleanup, and extensions Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/hostapd | 12 ++++---- ...ostapd-2.11-increase_EAPOL-timeouts.patch} | 11 ++++--- ...noscan.patch => hostapd-2.11-noscan.patch} | 30 +++++++++++-------- 3 files changed, 28 insertions(+), 25 deletions(-) rename src/patches/hostapd/{hostapd-2.9-increase_EAPOL-timeouts.patch => hostapd-2.11-increase_EAPOL-timeouts.patch} (61%) rename src/patches/hostapd/{hostapd-2.9-noscan.patch => hostapd-2.11-noscan.patch} (56%) diff --git a/lfs/hostapd b/lfs/hostapd index 5db99891d..2efa5a605 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config SUMMARY = Daemon for running a WPA capable Access Point -VER = 2_10 +VER = 2_11 THISAPP = hostap_$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 63 +PAK_VER = 64 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = de474630835a1208ce456d3151759cd3411dc63b2470de7144117634d4985aba1c878fd2cc2388cf6226bc0674eb2bf48cc4b4491f85f3461966b0278f75ea1e +$(DL_FILE)_BLAKE2 = de98a3634ff937b0068329219e4fa5dece34c9eeb27fa81a9e7de689d5dd2936ceb0ea43923a0e994e0a7bfcd71709b5f739df2f3efdd7c6ec5c765171711a19 install : $(TARGET) @@ -81,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-noscan.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.11-increase_EAPOL-timeouts.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.11-noscan.patch cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile diff --git a/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch b/src/patches/hostapd/hostapd-2.11-increase_EAPOL-timeouts.patch similarity index 61% rename from src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch rename to src/patches/hostapd/hostapd-2.11-increase_EAPOL-timeouts.patch index 67d9d4f22..d6f04cd12 100644 --- a/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch +++ b/src/patches/hostapd/hostapd-2.11-increase_EAPOL-timeouts.patch @@ -1,9 +1,8 @@ -diff U3 src/ap/wpa_auth.c src/ap/wpa_auth.c ---- a/src/ap/wpa_auth.c Wed Aug 7 15:25:25 2019 -+++ b/src/ap/wpa_auth.c Fri Sep 20 17:35:23 2019 -@@ -68,9 +68,9 @@ - static int ieee80211w_kde_len(struct wpa_state_machine *sm); - static u8 * ieee80211w_kde_add(struct wpa_state_machine *sm, u8 *pos); +--- hostap_2_11/src/ap/wpa_auth.c.orig 2024-07-20 20:04:37.000000000 +0200 ++++ hostap_2_11/src/ap/wpa_auth.c 2024-08-06 12:51:22.849029559 +0200 +@@ -75,9 +75,9 @@ + struct wpa_group *group); + -static const u32 eapol_key_timeout_first = 100; /* ms */ -static const u32 eapol_key_timeout_subseq = 1000; /* ms */ diff --git a/src/patches/hostapd/hostapd-2.9-noscan.patch b/src/patches/hostapd/hostapd-2.11-noscan.patch similarity index 56% rename from src/patches/hostapd/hostapd-2.9-noscan.patch rename to src/patches/hostapd/hostapd-2.11-noscan.patch index 01a33d0d0..ba3a71419 100644 --- a/src/patches/hostapd/hostapd-2.9-noscan.patch +++ b/src/patches/hostapd/hostapd-2.11-noscan.patch @@ -1,6 +1,7 @@ ---- a/hostapd/config_file.c -+++ b/hostapd/config_file.c -@@ -3474,6 +3474,10 @@ static int hostapd_config_fill(struct ho +diff -Naur hostap_2_11.orig/hostapd/config_file.c hostap_2_11/hostapd/config_file.c +--- hostap_2_11.orig/hostapd/config_file.c 2024-07-20 20:04:37.000000000 +0200 ++++ hostap_2_11/hostapd/config_file.c 2024-08-06 12:55:53.750009117 +0200 +@@ -3678,6 +3678,10 @@ if (bss->ocv && !bss->ieee80211w) bss->ieee80211w = 1; #endif /* CONFIG_OCV */ @@ -11,9 +12,10 @@ } else if (os_strcmp(buf, "ieee80211n") == 0) { conf->ieee80211n = atoi(pos); } else if (os_strcmp(buf, "ht_capab") == 0) { ---- a/src/ap/ap_config.h -+++ b/src/ap/ap_config.h -@@ -1014,6 +1014,8 @@ struct hostapd_config { +diff -Naur hostap_2_11.orig/src/ap/ap_config.h hostap_2_11/src/ap/ap_config.h +--- hostap_2_11.orig/src/ap/ap_config.h 2024-07-20 20:04:37.000000000 +0200 ++++ hostap_2_11/src/ap/ap_config.h 2024-08-06 12:57:06.779631503 +0200 +@@ -1108,6 +1108,8 @@ int ht_op_mode_fixed; u16 ht_capab; @@ -22,9 +24,10 @@ int ieee80211n; int secondary_channel; int no_pri_sec_switch; ---- a/src/ap/hw_features.c -+++ b/src/ap/hw_features.c -@@ -517,7 +517,8 @@ static int ieee80211n_check_40mhz(struct +diff -Naur hostap_2_11.orig/src/ap/hw_features.c hostap_2_11/src/ap/hw_features.c +--- hostap_2_11.orig/src/ap/hw_features.c 2024-07-20 20:04:37.000000000 +0200 ++++ hostap_2_11/src/ap/hw_features.c 2024-08-06 12:58:29.122962573 +0200 +@@ -551,7 +551,8 @@ int ret; /* Check that HT40 is used and PRI / SEC switch is allowed */ @@ -34,9 +37,10 @@ return 0; hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); ---- a/src/ap/ieee802_11_ht.c -+++ b/src/ap/ieee802_11_ht.c -@@ -230,6 +230,9 @@ void hostapd_2040_coex_action(struct hos +diff -Naur hostap_2_11.orig/src/ap/ieee802_11_ht.c hostap_2_11/src/ap/ieee802_11_ht.c +--- hostap_2_11.orig/src/ap/ieee802_11_ht.c 2024-07-20 20:04:37.000000000 +0200 ++++ hostap_2_11/src/ap/ieee802_11_ht.c 2024-08-06 13:00:31.237899938 +0200 +@@ -230,6 +230,9 @@ return; } @@ -46,7 +50,7 @@ if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) { wpa_printf(MSG_DEBUG, "Ignore too short 20/40 BSS Coexistence Management frame"); -@@ -390,6 +393,9 @@ void ht40_intolerant_add(struct hostapd_ +@@ -390,6 +393,9 @@ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) return; -- 2.45.2

2 1

[PATCH] collectd: Fixes bug-13074, create collectd.d directory
by Adolf Belka 06 Aug '24

06 Aug '24

- As requested in bug 13074, create a collectd.d directory to enable any addon definitions to be created. - Added include statement in conf file to load everything that is stored in the collectd.d directory. - Moved collectd.precache and collectd.thermal to the collectd.d directory and modified the paths for them in the collectd.conf file. - Modified the path for the collectd.thermal file in the initscript. - Removed the arm section in the initscript as only aarch64 is now used. - Modified the lfs to account for the changed directory for the precache and thermal files - Update of rootfile to take account of new path. - Removal of collectd.custom file as this was the previous way to define custom collectd profiles but would have been overwritten by any update of collectd. - Tested out in vm testbed with Core Update 187 and all existing graphs were still created and updated. From my evaluation the changes have not affected anything. - The creation of the collectd.d directory now allows users to add their own desired profiles but also if it is decided that an addon should be included in the processes graph, or if a new graph for addons is created then profiles for that addon can be placed in the collectd.d directory and will be automatically included by collectd. Fixes: Bug13074 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/collectd/collectd.conf | 7 +++---- config/collectd/collectd.custom | 1 - config/rootfiles/common/collectd | 8 ++++---- lfs/collectd | 10 ++++++---- src/initscripts/system/collectd | 9 +++------ 5 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 config/collectd/collectd.custom diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index cc49f0ba7..ec0c7a6a3 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -30,7 +30,7 @@ LoadPlugin syslog #LoadPlugin wireless LoadPlugin match_regex -include "/etc/collectd.precache" +include "/etc/collectd.d/collectd.precache" <Plugin interface> Interface "lo" @@ -86,6 +86,5 @@ include "/etc/collectd.precache" LogLevel info </Plugin> -#include "/etc/collectd.thermal" -include "/etc/collectd.custom" -include "/etc/collectd.vpn" +#include "/etc/collectd.d/collectd.thermal" +include "/etc/collectd.d/*" diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.custom deleted file mode 100644 index 7443bf3e6..000000000 --- a/config/collectd/collectd.custom +++ /dev/null @@ -1 +0,0 @@ -# Use this file to add custom configs and rules for collectd diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 65408dc7f..8a12fa844 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -1,8 +1,8 @@ etc/collectd.conf -etc/collectd.custom -etc/collectd.precache -etc/collectd.thermal -etc/collectd.vpn +#etc/collectd.d +etc/collectd.d/collectd.vpn +etc/collectd.d/collectd.precache +etc/collectd.d/collectd.thermal etc/rc.d/rc0.d/K50collectd etc/rc.d/rc3.d/S29collectd etc/rc.d/rc6.d/K50collectd diff --git a/lfs/collectd b/lfs/collectd index 24f5bc632..3f0deca26 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -125,10 +125,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-librrd=/usr/share/rrdtool-1.2.30 \ --with-fp-layout=nothing cd $(DIR_APP) && make install #collectd-4 does not support parallel build - cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ - mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn + mkdir /etc/collectd.d + cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/collectd.d/ + mv /etc/collectd.d/collectd.vpn /var/ipfire/ovpn/collectd.vpn + mv /etc/collectd.d/collectd.conf /etc/ chown nobody.nobody /var/ipfire/ovpn/collectd.vpn - ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.vpn + ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.d/collectd.vpn ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 56b799d56..79a81ce6a 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -68,9 +68,6 @@ case "$1" in # ARM does not support to scan for sensors. In that case, # we create an empty configuration file. machine=$(uname -m) - if [ "${machine:0:3}" = "arm" ]; then - touch /etc/sysconfig/lm_sensors - fi if [ "${machine:0:7}" = "aarch64" ]; then touch /etc/sysconfig/lm_sensors fi @@ -127,9 +124,9 @@ case "$1" in # Enable thermal plugin if thermal_zone found if [ ! -e /sys/class/thermal/thermal_zone0 ]; then - sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.thermal"|g' /etc/collectd.conf + sed -i -e 's|^include "/etc/collectd.d/collectd.thermal"$|#include "/etc/collectd.d/collectd.thermal"|g' /etc/collectd.conf else - sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf + sed -i -e 's|^#include "/etc/collectd.d/collectd.thermal"$|include "/etc/collectd.d/collectd.thermal"|g' /etc/collectd.conf fi # Enable cpufreq plugin if cpufreq found -- 2.45.2

2 2

[PATCH] Remove space after every 80 characters in WebGUI "Logs/System Logs".
by Stephen Cuka 06 Aug '24

06 Aug '24

Signed-off-by: Stephen Cuka <stephen(a)firemypi.org> --- This patch addresses an issue with the IPFire WebGUI adding a space after every 80 characters in the display of long log entries on the "Logs/System Logs" page. (Bug 13735) The patch removes the "very basic breaking of lines..." code and replaces it with a direct copy of the log entry $data to the display output variable $d. html/cgi-bin/logs.cgi/log.dat | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 01c382a0d..ce7de0178 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -412,11 +412,12 @@ foreach $_ (@log) $sec = 'kernel'; $data = $2.': '.$data; } - my $d = substr ($data,0,80); - while (length($data)>80){ #very basic breaking of lines... - $data = substr ($data,80); #permit correct display in table cell - $d .= ' ' . substr ($data,0,80); - } + #my $d = substr ($data,0,80); + #while (length($data)>80){ #very basic breaking of lines... + # $data = substr ($data,80); #permit correct display in table cell + # $d .= ' ' . substr ($data,0,80); + #} + my $d = $data; #don't break lines for display my $col=""; if ($lines % 2) { -- 2.34.1

4 5

Re: The unshared changes give a problem with build after doing git pull on next
by Michael Tremer 03 Aug '24

03 Aug '24

Hello Matthias, > On 3 Aug 2024, at 08:47, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: > > Hi Michael, > > [shortened some stuff] > > ... > >>>>> >>>>> Being curious I tried to build 'next', but I always get the same error: >>>>> >>>>> ***SNIP*** >>>>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>>>> Packaged toolchain compilation >>>>> Building IPFire >>>>> stage2 >>>>> Jul 26 13:32:59: Building stage2 unshare: cannot change >>>>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument > >>>> ... > >> It looks like you can simply update the kernel staying on the same release: >> >> https://ubuntu.com/security/livepatch/docs/livepatch/reference/kernels >> >> For 22.04 LTS, there is a Linux 6.8 image available. >> >> Could you check that and confirm that it fixes the mount propagation problem? > > Done. > > Current state is as follows: > > ***SNIP*** > ... > root@Devel64-1: /git/ipfire-2.x # lsb_release -a > No LSB modules are available. > Distributor ID: Ubuntu > Description: Ubuntu 22.04.4 LTS > Release: 22.04 > Codename: jammy > ... > root@Devel64-1: /git/ipfire-2.x # uname -mrs > Linux 6.8.0-39-generic x86_64 > ... > ***SNAP*** > > But when I try to build 'next' I get exactly the same error as > before: > > ***SNIP*** > root@Devel64-1: /git/ipfire-2.x # ./make.sh build > Packaged toolchain compilation > Building IPFire > stage2 > Aug 2 21:21:15: Building stage2 unshare: cannot change > /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument Ah, this is good information. So it is not the kernel, it rather is Ubuntu handling something differently. I will have a look at this and get back to you. > ERROR: Downloading stage2 > [ FAIL ] > Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if > applicable [ FAIL ] > ***SNAP*** > > Being curious, I commented line line 633 in 'make.sh' > ("--mount-proc=${BUILD_DIR}/proc") => Building starts but fails during > 'glib 2.77.0': > > ***SNIP*** > ... > glib (2.77.0) > [ 1:14 ][0/1011] > > [951/1374] Compiling C object gio/gio.p/gio-tool-tree.c.o > [952/1374] Linking target gio/gio > [953/1374] Compiling C object > gio/gio-querymodules.p/gio-querymodules.c.o > [954/1374] Linking target gio/gio-querymodules > [955/1374] Compiling C object gio/gresource.p/gresource-tool.c.o > [956/1374] Compiling C object > gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o > [957/1374] Linking target gio/gresource > [958/1374] Compiling C object > gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o > [959/1374] Compiling C object > gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o > [960/1374] Compiling C object > gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o > [961/1374] Compiling C object > gio/glib-compile-resources.p/glib-compile-resources.c.o > [962/1374] Linking target gio/glib-compile-resources > [963/1374] Compiling C object > gio/tests/modules/libtestmodulea.so.p/test-module-a.c.o > [964/1374] Compiling C object gio/gapplication.p/gapplication-tool.c.o > [965/1374] Compiling C object gio/gsettings.p/gsettings-tool.c.o > [966/1374] Linking target gio/tests/modules/libtestmodulea.so > [967/1374] Generating gio/tests/plugin-resources.c with a custom command > FAILED: gio/tests/plugin-resources.c > /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources > --compiler=gcc --target=gio/tests/plugin-resources.c --sour > cedir=/usr/src/glib-2.77.0/gio/tests --internal --generate-source > --c-name _g_plugin ../gio/tests/test4.gresource.xml > /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources: error > while loading shared libraries: libgio-2.0.so.0: can > not open shared object file: No such file or directory > [968/1374] Linking target gio/gapplication > [969/1374] Compiling C object > gio/glib-compile-schemas.p/glib-compile-schemas.c.o > [970/1374] Linking target gio/gsettings > [971/1374] Compiling C object > gio/tests/modules/libtestmoduleb.so.p/test-module-b.c.o > [972/1374] Compiling C object > gio/tests/gdbus-overflow.p/gdbus-overflow.c.o > [973/1374] Compiling C object gio/gdbus.p/gdbus-tool.c.o > [974/1374] Compiling C object > gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.so.p/meson-gener > ated_.._objectmanager-gen.c.o > ninja: build stopped: subcommand failed. > make: *** [glib:75: /usr/src/log/glib-2.77.0] Error 1 > make: Leaving directory '/usr/src/lfs' > > ERROR: Building glib > [ FAIL ] > Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if > applicable [ FAIL ] > ***SNAP*** > > Best > Matthias

1 1

Re: The unshared changes give a problem with build after doing git pull on next
by Michael Tremer 02 Aug '24

02 Aug '24

Hello, > On 26 Jul 2024, at 17:07, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: > > On 26.07.2024 17:08, Michael Tremer wrote: >> Hello, >> >>> On 26 Jul 2024, at 16:06, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >>> >>> On 26.07.2024 16:18, Michael Tremer wrote: >>>> Hello Matthias, >>> >>> Hi Michael, >>> >>>>> On 26 Jul 2024, at 15:08, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >>>>> >>>>> Hi, >>>>> >>>>> I'd like to jump in at this point...for me its not working as expected >>>>> and I don't know why. >>>>> >>>>> Being curious I tried to build 'next', but I always get the same error: >>>>> >>>>> ***SNIP*** >>>>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>>>> Packaged toolchain compilation >>>>> Building IPFire >>>>> stage2 >>>>> Jul 26 13:32:59: Building stage2 unshare: cannot change >>>>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument >>>> >>>> What is the host system that you are using? >>> >>> uname -a: >>> Linux Devel64-1 5.15.0-117-generic #127-Ubuntu SMP Fri Jul 5 20:13:28 >>> UTC 2024 x86_64 x86_64 x86_64 GNU/Linux >>> >>> lsb_release -a: >>> root@Devel64-1: /git/ipfire-2.x # lsb_release -a >>> No LSB modules are available. >>> Distributor ID: Ubuntu >>> Description: Ubuntu 22.04.4 LTS >>> Release: 22.04 >>> Codename: jammy >>> >>> Hardware: >>> Both 'devels' are running with i7-2600 / 16GB RAM. Worked with no >>> problems until current 'next'... ;-) >> >> Oh, wow this is quite an ancient kernel. Is there any chance you can update this? > > The *hardware* is rather old, but running without any problems. > > The Ubuntu version is not so old at all - > https://wiki.ubuntu.com/Releases states "End of Standard Support" = June > 2027 and EOL = April 2024. > That's why I haven't seen any reason to update the 'Devels' yet. > > Both are running and building anything I want - until the current > 'next'. ;-) > > Current state is: > > ***SNIP*** > root@Devel64-1: /git/ipfire-2.x # apt upgrade > Reading package lists... Done > Building dependency tree... Done > Reading state information... Done > Calculating upgrade... Done > The following packages have been kept back: > python3-update-manager update-manager update-manager-core > 0 upgraded, 0 newly installed, 0 to remove and 3 not upgraded. > ***SNAP*** > >>>>> >>>>> ERROR: Downloading stage2 >>>>> [ FAIL ] >>>>> Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if >>>>> applicable [ FAIL ] >>>>> ***SNAP*** >>>>> >>>>> This is a clean pull, nothing changed. >>>>> >>>>> And - I noticed some oddities: >>>>> >>>>> './make.sh downloadscr' runs without any errors, but doesn't verify >>>>> BLAKE2 checksums as before? >>>>> "***Verifying BLAKE2 checksum >>>>> all files BLAKE2 checksum match [ DONE ]" is missing. >>>> >>>> This is now done in one step. It has always done the verification twice before which is just unnecessary. >>> >>> I see. Ok for me. Sorry for the noise... >>> >>>>> Changing the BLAKE2 checksum on (e.g.) 'squid 6.10' didn't produce an >>>>> immidiate error, './make.sh downloadsrc' runs through and just ends with: >>>> >>>> Unless you are thinking that this is no longer working? >>> >>> I was just wondering - I missed the immediate error. >> >> What is in the logs? This seems to be a problem indeed. > > I tested 'squid 6.10' again with an intentionally *wrong* checksum in > lfs-file: > > As I wrote: > './make.sh downloadsrc' runs through, stops with "ERROR: Failed to > download sources" and tells me to "Check > /git/ipfire-2.x/log_x86_64/_build.preparation.log for errors..." as > stated below. You have to analyse this log to find what happened. > > I attached '_build.ipfire.log' and'_build.preparation.log' - just search > for "Error 1". I just tried to reproduce this. It does fail correctly with an incorrect checksum. That was a bit of a worry for me, but does not seem to be a problem. The usability might not be great. It shows FAIL for the failed packages, but it is quite hard to search for this. So I added the names of the failed packages the error message. I hope that solves it. > >>>>> ***SNIP*** >>>>> ERROR: Failed to download sources [ FAIL ] >>>>> Check /git/ipfire-2.x/log_x86_64/_build.preparation.log for errors >>>>> if applicable [ FAIL ] >>>>> ***SNAP*** >>>>> >>>>> And in this log I find: >>>>> ***SNIP*** >>>>> Jul 26 13:43:34: Building squid make: Entering directory >>>>> '/git/ipfire-2.x/lfs' >>>>> -e Download: https://source.ipfire.org/source-2.x/squid-6.10.tar.xz >>>>> 2024-07-26 15:43:35 >>>>> URL:https://source.ipfire.org/source-2.x/squid-6.10.tar.xz >>>>> [2558208/2558208] -> "/tmp/squid-6.10.tar >>>>> make: *** [squid:67: /git/ipfire-2.x/cache/squid-6.10.tar.xz] Error 1 >>>>> ***SNAP*** >>>>> >>>>> If I test this wrong checksum with Core186 (e.g.), 'make' stops in >>>>> between and I get: >>>>> ***SNIP*** >>>>> ERROR: BLAKE2 checksum error in squid, check file in cache or signature >>>>> [ FAIL ] >>>>> Check /git/ipfire-2.x/log/_build.preparation.log for errors if >>>>> applicable [ FAIL ] >>>>> ***SNAP*** >>>> >>>> I don’t quite understand what the problem is here? What do you expect to happen? >>> >>> As stated above - I was just wondering why a checksum error didn't >>> produce an appropriate error message like before, pointing at the >>> affected package. >> >> It totally should. >> >>> >>>>> And: >>>>> './make.sh gettoolchain' doesn't give any feedback, cursor just jumps to >>>>> the next line. No "Toolchain is already downloaded. Exiting..." as before. >>>> >>>> It might be that I have removed the output when refactoring the function. >>>> >>>> Is the toolchain downloaded okay though? >>> >>> The toolchain is downloaded and OK. >>> >>> Best >>> Matthias >>> >>>> >>>> -Michael >>>> >>>>> >>>>> Do I have an error somewhere? >>>>> >>>>> Best >>>>> Matthias >>>>> >>>>> >>>>> On 26.07.2024 15:05, Michael Tremer wrote: >>>>>> Hello, >>>>>> >>>>>>> On 26 Jul 2024, at 13:39, Adolf Belka <adolf.belka(a)ipfire.org> wrote: >>>>>>> >>>>>>> Hi Michael, >>>>>>> >>>>>>> On 26/07/2024 10:35, Adolf Belka wrote: >>>>>>>> Hi Michael, >>>>>>>> >>>>>>>> On 26/07/2024 10:17, Michael Tremer wrote: >>>>>>>>> Hello, >>>>>>>>> >>>>>>>>> Hmm, this might be a slight transitioning problem… >>>>>>>> >>>>>>>> Yes, of course. >>>>>>>>> >>>>>>>>> If you are now in next and build the distribution, it will likely build in build_x86_64/ and logs will be stored in logs_x86_64/. If you run ./make.sh clean, those directories will be removed. >>>>>>>> >>>>>>>> I had forgotten that the new build system created the build and log dirs with the architecture included in the name now. >>>>>>>> >>>>>>>> My next still had all the build and logs from the last build run and I did not do a ./make.sh clean before I did the pit pull. So the new clean was trying to remove the build_x86_64 but I still had the build dire. >>>>>>>>> >>>>>>>>> If you however change back to master, it will assume that your build is in build/ and your logs are in logs/. If you then run clean, it will try to remove those directories and since they don’t exist, ./make.sh clean will return really quickly.> Is this maybe what happens? >>>>>>>> >>>>>>>> Yes. That makes sense. >>>>>>>>> >>>>>>>>> You can fix this by either removing the directories by hand or changing to next, run ./make.sh clean, then change to master and run it again. That should give you a clean tree. >>>>>>>> >>>>>>>> I will run the clean in master which will get rid of all the old named dirs and then move to next with a clean structure for doing the build with the new system. >>>>>>>> >>>>>>> Everything worked fine for the build after I cleared out the old dirs. >>>>>>> >>>>>>> Have noticed a couple of things. The new build process creates log_x86_64 and all log info is placed in there. However the log dir is still present and when I deleted it and started the build it was re-created but stayed empty the whole time. Not a big issue. >>>>>> >>>>>> Oh, I did not notice this, but we should change that... >>>>>> >>>>>>> The other thing I found was that the following were listed in the untracked changes section. >>>>>>> >>>>>>> doc/ChangeLog >>>>>>> doc/packages-list.txt >>>>>> >>>>>> We used to generate these files, but I don’t think they have any value any more, so I removed them. This was also necessary because the build environment can no longer write to the doc/ directory. >>>>>> >>>>>> You can just delete them, but if you build master again, they will be created again. >>>>>> >>>>>>> I just did my build ignoring them but presumably they either need to be added somewhere to include them or they need to be added to the .gitignore >>>>>>> >>>>>>> Apart from those two very minor observations, the new build process ran very nicely. >>>>>> >>>>>> That is good to know! >>>>>> >>>>>> Best, >>>>>> -Michael >>>>>> >>>>>>> Regards, >>>>>>> >>>>>>> Adolf >>>>>>> >>>>>>>> Thanks. >>>>>>>> >>>>>>>> Adolf. >>>>>>>>> >>>>>>>>> Best, >>>>>>>>> -Michael >>>>>>>>> >>>>>>>>>> On 26 Jul 2024, at 08:57, Adolf Belka <adolf.belka(a)ipfire.org> wrote: >>>>>>>>>> >>>>>>>>>> Hi Michael, >>>>>>>>>> >>>>>>>>>> I ran git pull origin next on my local repo and then went to try a package update build. >>>>>>>>>> >>>>>>>>>> The gettoolchain and downloadsrc worked fine. However the ./make.sh clean just came straight back to the cursor without removing any of the directories in my repo. >>>>>>>>>> >>>>>>>>>> I am now using my master repo version for doing the package update but something has gone wrong with the unshared migration because the clean command worked fine when it was in your own repo. >>>>>>>>>> >>>>>>>>>> Regards, >>>>>>>>>> >>>>>>>>>> Adolf. >> >>

1 0

The unshared changes give a problem with build after doing git pull on next
by Adolf Belka 02 Aug '24

02 Aug '24

Hi Michael, I ran git pull origin next on my local repo and then went to try a package update build. The gettoolchain and downloadsrc worked fine. However the ./make.sh clean just came straight back to the cursor without removing any of the directories in my repo. I am now using my master repo version for doing the package update but something has gone wrong with the unshared migration because the clean command worked fine when it was in your own repo. Regards, Adolf.

3 9

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development August 2024