This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 2fc167d93bae4b61e127521f05d80848142ca4e0 (commit) via 05c31f4f144ce011a350aca1bc28cde3121b82ce (commit) via 7fdafdfbcef8505312d6d50a7b95153ea80e2032 (commit) from 62db0b5320a0958b1677191bc177e5dbdaa8d608 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 2fc167d93bae4b61e127521f05d80848142ca4e0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 4 23:33:01 2024 +0200

kernel: update to 6.6.24

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 05c31f4f144ce011a350aca1bc28cde3121b82ce Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 4 18:26:55 2024 +0200

core186: add collectd to updater

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 7fdafdfbcef8505312d6d50a7b95153ea80e2032 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 4 18:23:29 2024 +0200

collectd: fix cpufreq graph if virtual cores are offline

the kernel doesn't allow to read the frequency of a offline virtual core if smt is disabled so now no error is reported in this case and NaN submited to the database.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 4 ++-- config/rootfiles/common/x86_64/linux | 2 +- .../{oldcore/125 => core/186}/filelists/collectd | 0 lfs/collectd | 2 ++ lfs/linux | 4 ++-- .../collectd-4.10.9-cpufreq_skip_disabled_cores.patch | 18 ++++++++++++++++++ 6 files changed, 25 insertions(+), 5 deletions(-) copy config/rootfiles/{oldcore/125 => core/186}/filelists/collectd (100%) create mode 100644 src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch

Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 9f7abd58f1..f6d9ede285 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.23-ipfire Kernel Configuration +# Linux/x86 6.6.24-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -176,7 +176,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index be499ef5f3..e74e1f98c2 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -8191,7 +8191,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/FW_LOADER_USER_HELPER #lib/modules/KVER-ipfire/build/include/config/GACT_PROB #lib/modules/KVER-ipfire/build/include/config/GARP -#lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS +#lib/modules/KVER-ipfire/build/include/config/GCC10_NO_ARRAY_BOUNDS #lib/modules/KVER-ipfire/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION diff --git a/config/rootfiles/core/186/filelists/collectd b/config/rootfiles/core/186/filelists/collectd new file mode 120000 index 0000000000..871b32f14b --- /dev/null +++ b/config/rootfiles/core/186/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/lfs/collectd b/lfs/collectd index 5c4236b3af..24f5bc632e 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -103,12 +103,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10-drop-linux-disk-module.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-fix-glibc-headers.patch + cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/lfs/linux b/lfs/linux index 9383a32968..f5ef18d622 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@

include Config

-VER = 6.6.23 +VER = 6.6.24

THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \

$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = b00e2c084f9d7a4fcda0a9404fd897ca1fc90d660dd1063d699c8ec612c6a35c494ce14c91f458a1f77f2a70ce6612e019e5fc553b571ee669b5070f97841a02 +$(DL_FILE)_BLAKE2 = 0f4643c758bb3857396f08b0cc291e1cf7cc7d120fe53791ba8cdaa32f08f20822353e04464551b88e8de64e367de6900da01504e57bc684d47390b51d001285

install : $(TARGET)

diff --git a/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch b/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch new file mode 100644 index 0000000000..e8851b6c7e --- /dev/null +++ b/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch @@ -0,0 +1,18 @@ +diff -Naur collectd-4.10.9.org/src/cpufreq.c collectd-4.10.9/src/cpufreq.c +--- collectd-4.10.9.org/src/cpufreq.c 2013-04-08 08:26:17.000000000 +0200 ++++ collectd-4.10.9/src/cpufreq.c 2024-04-04 15:33:52.705372940 +0200 +@@ -104,12 +104,9 @@ + + if (fgets (buffer, 16, fp) == NULL) + { +- char errbuf[1024]; +- WARNING ("cpufreq: fgets: %s", +- sstrerror (errno, errbuf, +- sizeof (errbuf))); + fclose (fp); +- return (-1); ++ cpufreq_submit (i, NAN); ++ break; + } + + if (fclose (fp))

hooks/post-receive -- IPFire 2.x development tree