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 790c04a6eaafcf695315dcd3f4f39ec6b35be48c (commit) via 24d23a7053c6565606f5e9834a1def8a57d75617 (commit) via 28796e09e5e5997d2ee9e11e3de7ca4b139d4c11 (commit) via 77bae935e6f5823d1527f5d97959c97b737e3379 (commit) via 81986d40a9acfcdc1658beae925052f4464191df (commit) from 08d869d54f4903593992d7aee2ef17d79d235108 (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 790c04a6eaafcf695315dcd3f4f39ec6b35be48c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 22 06:39:34 2024 +0100
core186: start update
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 24d23a7053c6565606f5e9834a1def8a57d75617 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Mar 21 19:12:14 2024 +0100
vulnerabilities.cgi: add RFDS (CVE-2ß23-28746) to list
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 28796e09e5e5997d2ee9e11e3de7ca4b139d4c11 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 20 17:28:43 2024 +0100
kernel: update to 6.6.22
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 77bae935e6f5823d1527f5d97959c97b737e3379 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 20 09:28:51 2024 +0100
cpufrequtils: remove cpufrequtils
the only file in the package is now the initskript to configre powersave mode using cpupower which is shipped with the kernel.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 81986d40a9acfcdc1658beae925052f4464191df Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 20 09:27:50 2024 +0100
kernel: build cpupower
cpupower replace the function of cpufrequtils which is not updated since years.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 8 ++-- config/kernel/kernel.config.x86_64-ipfire | 9 +++-- config/rootfiles/common/aarch64/linux | 31 +++++++++++++++ config/rootfiles/common/riscv64/linux | 29 ++++++++++++++ config/rootfiles/common/x86_64/linux | 33 ++++++++++++++++ config/rootfiles/core/{185 => 186}/exclude | 0 .../124 => core/186}/filelists/aarch64/linux | 0 .../core/{185 => 186}/filelists/core-files | 0 .../{oldcore/178 => core/186}/filelists/files | 1 - .../181 => core/186}/filelists/riscv64/linux | 0 .../100 => core/186}/filelists/x86_64/linux | 0 .../rootfiles/{oldcore/178 => core/186}/update.sh | 30 ++++++--------- config/rootfiles/{core => oldcore}/185/exclude | 0 .../185/filelists/aarch64/binutils | 0 .../{core => oldcore}/185/filelists/aarch64/glibc | 0 .../185/filelists/aarch64/util-linux | 0 .../{core => oldcore}/185/filelists/arping | 0 .../rootfiles/{core => oldcore}/185/filelists/bind | 0 .../185/filelists/ca-certificates | 0 .../{core => oldcore}/185/filelists/core-files | 0 .../{core => oldcore}/185/filelists/elfutils | 0 .../{core => oldcore}/185/filelists/ethtool | 0 .../{core => oldcore}/185/filelists/expat | 0 .../{core => oldcore}/185/filelists/files | 0 .../{core => oldcore}/185/filelists/iproute2 | 0 .../{core => oldcore}/185/filelists/iputils | 0 .../rootfiles/{core => oldcore}/185/filelists/knot | 0 .../{core => oldcore}/185/filelists/libcap | 0 .../{core => oldcore}/185/filelists/libffi | 0 .../{core => oldcore}/185/filelists/libgpg-error | 0 .../{core => oldcore}/185/filelists/libhtp | 0 .../{core => oldcore}/185/filelists/libpng | 0 .../rootfiles/{core => oldcore}/185/filelists/newt | 0 .../rootfiles/{core => oldcore}/185/filelists/ntp | 0 .../{core => oldcore}/185/filelists/openjpeg | 0 .../{core => oldcore}/185/filelists/openssh | 0 .../{core => oldcore}/185/filelists/pango | 0 .../{core => oldcore}/185/filelists/pciutils | 0 .../{core => oldcore}/185/filelists/pixman | 0 .../{core => oldcore}/185/filelists/poppler | 0 .../rootfiles/{core => oldcore}/185/filelists/ppp | 0 .../rootfiles/{core => oldcore}/185/filelists/qpdf | 0 .../185/filelists/riscv64/binutils | 0 .../{core => oldcore}/185/filelists/riscv64/glibc | 0 .../185/filelists/riscv64/util-linux | 0 .../{core => oldcore}/185/filelists/shadow | 0 .../{core => oldcore}/185/filelists/sqlite | 0 .../{core => oldcore}/185/filelists/squid | 0 .../{core => oldcore}/185/filelists/suricata | 0 .../rootfiles/{core => oldcore}/185/filelists/tcl | 0 .../{core => oldcore}/185/filelists/unbound | 0 .../rootfiles/{core => oldcore}/185/filelists/wget | 0 .../{core => oldcore}/185/filelists/whois | 0 .../185/filelists/x86_64/binutils | 0 .../{core => oldcore}/185/filelists/x86_64/glibc | 0 .../185/filelists/x86_64/intel-microcode | 0 .../185/filelists/x86_64/util-linux | 0 .../rootfiles/{core => oldcore}/185/filelists/xz | 0 config/rootfiles/{core => oldcore}/185/update.sh | 0 config/rootfiles/packages/cpufrequtils | 16 -------- html/cgi-bin/vulnerabilities.cgi | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/cpufrequtils | 44 ++++------------------ lfs/linux | 9 ++++- make.sh | 2 +- src/initscripts/packages/cpufreq | 11 +----- 66 files changed, 133 insertions(+), 92 deletions(-) copy config/rootfiles/core/{185 => 186}/exclude (100%) copy config/rootfiles/{oldcore/124 => core/186}/filelists/aarch64/linux (100%) copy config/rootfiles/core/{185 => 186}/filelists/core-files (100%) copy config/rootfiles/{oldcore/178 => core/186}/filelists/files (68%) copy config/rootfiles/{oldcore/181 => core/186}/filelists/riscv64/linux (100%) copy config/rootfiles/{oldcore/100 => core/186}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/178 => core/186}/update.sh (88%) rename config/rootfiles/{core => oldcore}/185/exclude (100%) rename config/rootfiles/{core => oldcore}/185/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/185/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/185/filelists/aarch64/util-linux (100%) rename config/rootfiles/{core => oldcore}/185/filelists/arping (100%) rename config/rootfiles/{core => oldcore}/185/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/185/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/185/filelists/core-files (100%) rename config/rootfiles/{core => oldcore}/185/filelists/elfutils (100%) rename config/rootfiles/{core => oldcore}/185/filelists/ethtool (100%) rename config/rootfiles/{core => oldcore}/185/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/185/filelists/files (100%) rename config/rootfiles/{core => oldcore}/185/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/185/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/185/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/185/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/185/filelists/libffi (100%) rename config/rootfiles/{core => oldcore}/185/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/185/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/185/filelists/libpng (100%) rename config/rootfiles/{core => oldcore}/185/filelists/newt (100%) rename config/rootfiles/{core => oldcore}/185/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/185/filelists/openjpeg (100%) rename config/rootfiles/{core => oldcore}/185/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/185/filelists/pango (100%) rename config/rootfiles/{core => oldcore}/185/filelists/pciutils (100%) rename config/rootfiles/{core => oldcore}/185/filelists/pixman (100%) rename config/rootfiles/{core => oldcore}/185/filelists/poppler (100%) rename config/rootfiles/{core => oldcore}/185/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/185/filelists/qpdf (100%) rename config/rootfiles/{core => oldcore}/185/filelists/riscv64/binutils (100%) rename config/rootfiles/{core => oldcore}/185/filelists/riscv64/glibc (100%) rename config/rootfiles/{core => oldcore}/185/filelists/riscv64/util-linux (100%) rename config/rootfiles/{core => oldcore}/185/filelists/shadow (100%) rename config/rootfiles/{core => oldcore}/185/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/185/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/185/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/185/filelists/tcl (100%) rename config/rootfiles/{core => oldcore}/185/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/185/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/185/filelists/whois (100%) rename config/rootfiles/{core => oldcore}/185/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/185/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/185/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/185/filelists/x86_64/util-linux (100%) rename config/rootfiles/{core => oldcore}/185/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/185/update.sh (100%)
Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 04d65d6ce8..11a3ef593d 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,20 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.15-ipfire Kernel Configuration +# Linux/arm64 6.6.22-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24100 +CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24100 +CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -4556,7 +4557,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_STMPE is not set CONFIG_MFD_SUN6I_PRCM=y CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_TI_LMU is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 79375e954d..319aa2effc 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,20 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.15-ipfire Kernel Configuration +# Linux/x86 6.6.22-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24100 +CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24100 +CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -508,6 +509,7 @@ CONFIG_CPU_IBRS_ENTRY=y CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_MITIGATION_RFDS=y CONFIG_ARCH_HAS_ADD_PAGES=y
# @@ -4402,7 +4404,6 @@ CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SKY81452 is not set CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_TI_LMU is not set # CONFIG_TPS6105X is not set diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 92c4a4286c..3dcacfd4da 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -442,6 +442,7 @@ boot/dtb-KVER-ipfire #boot/dtb-KVER-ipfire/synaptics/berlin4ct-dmp.dtb #boot/dtb-KVER-ipfire/synaptics/berlin4ct-stb.dtb boot/vmlinuz-KVER-ipfire +#etc/cpufreq-bench.conf etc/modprobe.d/framebuffer.conf etc/modprobe.d/ipv6.conf #lib/modules @@ -8507,6 +8508,7 @@ etc/modprobe.d/ipv6.conf #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/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION @@ -12463,6 +12465,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/at91.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/axi-dmac.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/dw-dmac.h +#lib/modules/KVER-ipfire/build/include/dt-bindings/dma/fsl-edma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4775-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4780-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/nbpfaxi.h @@ -23215,3 +23218,31 @@ lib/modules/KVER-ipfire/modules.symbols lib/modules/KVER-ipfire/modules.symbols.bin #lib/modules/KVER-ipfire/source sbin/gen_init_cpio +#usr/bin/cpufreq-bench_plot.sh +usr/bin/cpupower +#usr/include/cpuidle.h +#usr/include/powercap.h +#usr/lib/libcpupower.so +usr/lib/libcpupower.so.0.0.1 +usr/lib/libcpupower.so.1 +#usr/man/man1/cpupower-frequency-info.1 +#usr/man/man1/cpupower-frequency-set.1 +#usr/man/man1/cpupower-idle-info.1 +#usr/man/man1/cpupower-idle-set.1 +#usr/man/man1/cpupower-info.1 +#usr/man/man1/cpupower-monitor.1 +#usr/man/man1/cpupower-powercap-info.1 +#usr/man/man1/cpupower-set.1 +#usr/man/man1/cpupower.1 +#usr/sbin/cpufreq-bench +#usr/share/bash-completion/completions/cpupower +#usr/share/doc/packages +#usr/share/doc/packages/cpupower +#usr/share/doc/packages/cpupower/README-BENCH +#usr/share/doc/packages/cpupower/cpufreq-bench_script.sh +#usr/share/locale/cs/LC_MESSAGES/cpupower.mo +#usr/share/locale/de/LC_MESSAGES/cpupower.mo +#usr/share/locale/fr/LC_MESSAGES/cpupower.mo +#usr/share/locale/it/LC_MESSAGES/cpupower.mo +#usr/share/locale/ka/LC_MESSAGES/cpupower.mo +#usr/share/locale/pt/LC_MESSAGES/cpupower.mo diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux index 5e1ac921cb..0955b0882c 100644 --- a/config/rootfiles/common/riscv64/linux +++ b/config/rootfiles/common/riscv64/linux @@ -16,6 +16,7 @@ boot/dtb-KVER-ipfire #boot/dtb-KVER-ipfire/starfive/jh7110-starfive-visionfive-2-v1.2a.dtb #boot/dtb-KVER-ipfire/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb boot/vmlinuz-KVER-ipfire +#etc/cpufreq-bench.conf etc/modprobe.d/framebuffer.conf etc/modprobe.d/ipv6.conf #lib/modules @@ -22462,3 +22463,31 @@ lib/modules/KVER-ipfire/modules.symbols lib/modules/KVER-ipfire/modules.symbols.bin #lib/modules/KVER-ipfire/source sbin/gen_init_cpio +#usr/bin/cpufreq-bench_plot.sh +usr/bin/cpupower +#usr/include/cpuidle.h +#usr/include/powercap.h +#usr/lib/libcpupower.so +usr/lib/libcpupower.so.0.0.1 +usr/lib/libcpupower.so.1 +#usr/man/man1/cpupower-frequency-info.1 +#usr/man/man1/cpupower-frequency-set.1 +#usr/man/man1/cpupower-idle-info.1 +#usr/man/man1/cpupower-idle-set.1 +#usr/man/man1/cpupower-info.1 +#usr/man/man1/cpupower-monitor.1 +#usr/man/man1/cpupower-powercap-info.1 +#usr/man/man1/cpupower-set.1 +#usr/man/man1/cpupower.1 +#usr/sbin/cpufreq-bench +#usr/share/bash-completion/completions/cpupower +#usr/share/doc/packages +#usr/share/doc/packages/cpupower +#usr/share/doc/packages/cpupower/README-BENCH +#usr/share/doc/packages/cpupower/cpufreq-bench_script.sh +#usr/share/locale/cs/LC_MESSAGES/cpupower.mo +#usr/share/locale/de/LC_MESSAGES/cpupower.mo +#usr/share/locale/fr/LC_MESSAGES/cpupower.mo +#usr/share/locale/it/LC_MESSAGES/cpupower.mo +#usr/share/locale/ka/LC_MESSAGES/cpupower.mo +#usr/share/locale/pt/LC_MESSAGES/cpupower.mo diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index f3a8dea19c..be499ef5f3 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -1,6 +1,7 @@ boot/System.map-KVER-ipfire boot/config-KVER-ipfire boot/vmlinuz-KVER-ipfire +#etc/cpufreq-bench.conf etc/modprobe.d/framebuffer.conf etc/modprobe.d/ipv6.conf #lib/modules @@ -8191,6 +8192,7 @@ etc/modprobe.d/ipv6.conf #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/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION #lib/modules/KVER-ipfire/build/include/config/GENERIC_ALLOCATOR @@ -9202,6 +9204,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_PCI #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_USB +#lib/modules/KVER-ipfire/build/include/config/MITIGATION_RFDS #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE_GEN2 #lib/modules/KVER-ipfire/build/include/config/MLX4_EN @@ -12482,6 +12485,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/at91.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/axi-dmac.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/dw-dmac.h +#lib/modules/KVER-ipfire/build/include/dt-bindings/dma/fsl-edma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4775-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4780-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/nbpfaxi.h @@ -23699,3 +23703,32 @@ lib/modules/KVER-ipfire/modules.symbols lib/modules/KVER-ipfire/modules.symbols.bin #lib/modules/KVER-ipfire/source sbin/gen_init_cpio +#usr/bin/cpufreq-bench_plot.sh +usr/bin/cpupower +#usr/include/cpufreq.h +#usr/include/cpuidle.h +#usr/include/powercap.h +#usr/lib/libcpupower.so +usr/lib/libcpupower.so.0.0.1 +usr/lib/libcpupower.so.1 +#usr/man/man1/cpupower-frequency-info.1 +#usr/man/man1/cpupower-frequency-set.1 +#usr/man/man1/cpupower-idle-info.1 +#usr/man/man1/cpupower-idle-set.1 +#usr/man/man1/cpupower-info.1 +#usr/man/man1/cpupower-monitor.1 +#usr/man/man1/cpupower-powercap-info.1 +#usr/man/man1/cpupower-set.1 +#usr/man/man1/cpupower.1 +#usr/sbin/cpufreq-bench +#usr/share/bash-completion/completions/cpupower +#usr/share/doc/packages +#usr/share/doc/packages/cpupower +#usr/share/doc/packages/cpupower/README-BENCH +#usr/share/doc/packages/cpupower/cpufreq-bench_script.sh +#usr/share/locale/cs/LC_MESSAGES/cpupower.mo +#usr/share/locale/de/LC_MESSAGES/cpupower.mo +#usr/share/locale/fr/LC_MESSAGES/cpupower.mo +#usr/share/locale/it/LC_MESSAGES/cpupower.mo +#usr/share/locale/ka/LC_MESSAGES/cpupower.mo +#usr/share/locale/pt/LC_MESSAGES/cpupower.mo diff --git a/config/rootfiles/core/185/exclude b/config/rootfiles/core/186/exclude similarity index 100% rename from config/rootfiles/core/185/exclude rename to config/rootfiles/core/186/exclude diff --git a/config/rootfiles/core/186/filelists/aarch64/linux b/config/rootfiles/core/186/filelists/aarch64/linux new file mode 120000 index 0000000000..3a2532bc7d --- /dev/null +++ b/config/rootfiles/core/186/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/core-files b/config/rootfiles/core/186/filelists/core-files similarity index 100% rename from config/rootfiles/core/185/filelists/core-files rename to config/rootfiles/core/186/filelists/core-files diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files new file mode 100644 index 0000000000..00198bcc3e --- /dev/null +++ b/config/rootfiles/core/186/filelists/files @@ -0,0 +1 @@ +srv/web/ipfire/cgi-bin/vulnerabilities.cgi diff --git a/config/rootfiles/core/186/filelists/riscv64/linux b/config/rootfiles/core/186/filelists/riscv64/linux new file mode 120000 index 0000000000..c8e8350ca6 --- /dev/null +++ b/config/rootfiles/core/186/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/186/filelists/x86_64/linux b/config/rootfiles/core/186/filelists/x86_64/linux new file mode 120000 index 0000000000..0615b5b9ad --- /dev/null +++ b/config/rootfiles/core/186/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh new file mode 100644 index 0000000000..d79a35133d --- /dev/null +++ b/config/rootfiles/core/186/update.sh @@ -0,0 +1,141 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2024 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=186 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root and size of boot +ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 ) +if [ $ROOTSPACE -lt 200000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 +fi +BOOTSIZE=$( df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1 ) +if [ $BOOTSIZE -lt 100000 ]; then + exit_with_error "ERROR cannot update. BOOT partition is to small." 3 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules + +# Extract files +extract_files + +# Remove files +#rm -rvf \ +# /XXX + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# Build initial ramdisks +dracut --regenerate-all --force +KVER="xxxKVERxxx" +case "$(uname -m)" in + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac + +# Upadate Kernel version in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +# This update needs a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + /usr/bin/install-bootloader +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/185/exclude b/config/rootfiles/oldcore/185/exclude new file mode 100644 index 0000000000..8ee1c3c2f5 --- /dev/null +++ b/config/rootfiles/oldcore/185/exclude @@ -0,0 +1,35 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/lib/location/ipset +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/185/filelists/aarch64/binutils b/config/rootfiles/oldcore/185/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/185/filelists/aarch64/binutils rename to config/rootfiles/oldcore/185/filelists/aarch64/binutils diff --git a/config/rootfiles/core/185/filelists/aarch64/glibc b/config/rootfiles/oldcore/185/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/185/filelists/aarch64/glibc rename to config/rootfiles/oldcore/185/filelists/aarch64/glibc diff --git a/config/rootfiles/core/185/filelists/aarch64/util-linux b/config/rootfiles/oldcore/185/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/185/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/185/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/185/filelists/arping b/config/rootfiles/oldcore/185/filelists/arping similarity index 100% rename from config/rootfiles/core/185/filelists/arping rename to config/rootfiles/oldcore/185/filelists/arping diff --git a/config/rootfiles/core/185/filelists/bind b/config/rootfiles/oldcore/185/filelists/bind similarity index 100% rename from config/rootfiles/core/185/filelists/bind rename to config/rootfiles/oldcore/185/filelists/bind diff --git a/config/rootfiles/core/185/filelists/ca-certificates b/config/rootfiles/oldcore/185/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/185/filelists/ca-certificates rename to config/rootfiles/oldcore/185/filelists/ca-certificates diff --git a/config/rootfiles/oldcore/185/filelists/core-files b/config/rootfiles/oldcore/185/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/185/filelists/elfutils b/config/rootfiles/oldcore/185/filelists/elfutils similarity index 100% rename from config/rootfiles/core/185/filelists/elfutils rename to config/rootfiles/oldcore/185/filelists/elfutils diff --git a/config/rootfiles/core/185/filelists/ethtool b/config/rootfiles/oldcore/185/filelists/ethtool similarity index 100% rename from config/rootfiles/core/185/filelists/ethtool rename to config/rootfiles/oldcore/185/filelists/ethtool diff --git a/config/rootfiles/core/185/filelists/expat b/config/rootfiles/oldcore/185/filelists/expat similarity index 100% rename from config/rootfiles/core/185/filelists/expat rename to config/rootfiles/oldcore/185/filelists/expat diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/oldcore/185/filelists/files similarity index 100% rename from config/rootfiles/core/185/filelists/files rename to config/rootfiles/oldcore/185/filelists/files diff --git a/config/rootfiles/core/185/filelists/iproute2 b/config/rootfiles/oldcore/185/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/185/filelists/iproute2 rename to config/rootfiles/oldcore/185/filelists/iproute2 diff --git a/config/rootfiles/core/185/filelists/iputils b/config/rootfiles/oldcore/185/filelists/iputils similarity index 100% rename from config/rootfiles/core/185/filelists/iputils rename to config/rootfiles/oldcore/185/filelists/iputils diff --git a/config/rootfiles/core/185/filelists/knot b/config/rootfiles/oldcore/185/filelists/knot similarity index 100% rename from config/rootfiles/core/185/filelists/knot rename to config/rootfiles/oldcore/185/filelists/knot diff --git a/config/rootfiles/core/185/filelists/libcap b/config/rootfiles/oldcore/185/filelists/libcap similarity index 100% rename from config/rootfiles/core/185/filelists/libcap rename to config/rootfiles/oldcore/185/filelists/libcap diff --git a/config/rootfiles/core/185/filelists/libffi b/config/rootfiles/oldcore/185/filelists/libffi similarity index 100% rename from config/rootfiles/core/185/filelists/libffi rename to config/rootfiles/oldcore/185/filelists/libffi diff --git a/config/rootfiles/core/185/filelists/libgpg-error b/config/rootfiles/oldcore/185/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/185/filelists/libgpg-error rename to config/rootfiles/oldcore/185/filelists/libgpg-error diff --git a/config/rootfiles/core/185/filelists/libhtp b/config/rootfiles/oldcore/185/filelists/libhtp similarity index 100% rename from config/rootfiles/core/185/filelists/libhtp rename to config/rootfiles/oldcore/185/filelists/libhtp diff --git a/config/rootfiles/core/185/filelists/libpng b/config/rootfiles/oldcore/185/filelists/libpng similarity index 100% rename from config/rootfiles/core/185/filelists/libpng rename to config/rootfiles/oldcore/185/filelists/libpng diff --git a/config/rootfiles/core/185/filelists/newt b/config/rootfiles/oldcore/185/filelists/newt similarity index 100% rename from config/rootfiles/core/185/filelists/newt rename to config/rootfiles/oldcore/185/filelists/newt diff --git a/config/rootfiles/core/185/filelists/ntp b/config/rootfiles/oldcore/185/filelists/ntp similarity index 100% rename from config/rootfiles/core/185/filelists/ntp rename to config/rootfiles/oldcore/185/filelists/ntp diff --git a/config/rootfiles/core/185/filelists/openjpeg b/config/rootfiles/oldcore/185/filelists/openjpeg similarity index 100% rename from config/rootfiles/core/185/filelists/openjpeg rename to config/rootfiles/oldcore/185/filelists/openjpeg diff --git a/config/rootfiles/core/185/filelists/openssh b/config/rootfiles/oldcore/185/filelists/openssh similarity index 100% rename from config/rootfiles/core/185/filelists/openssh rename to config/rootfiles/oldcore/185/filelists/openssh diff --git a/config/rootfiles/core/185/filelists/pango b/config/rootfiles/oldcore/185/filelists/pango similarity index 100% rename from config/rootfiles/core/185/filelists/pango rename to config/rootfiles/oldcore/185/filelists/pango diff --git a/config/rootfiles/core/185/filelists/pciutils b/config/rootfiles/oldcore/185/filelists/pciutils similarity index 100% rename from config/rootfiles/core/185/filelists/pciutils rename to config/rootfiles/oldcore/185/filelists/pciutils diff --git a/config/rootfiles/core/185/filelists/pixman b/config/rootfiles/oldcore/185/filelists/pixman similarity index 100% rename from config/rootfiles/core/185/filelists/pixman rename to config/rootfiles/oldcore/185/filelists/pixman diff --git a/config/rootfiles/core/185/filelists/poppler b/config/rootfiles/oldcore/185/filelists/poppler similarity index 100% rename from config/rootfiles/core/185/filelists/poppler rename to config/rootfiles/oldcore/185/filelists/poppler diff --git a/config/rootfiles/core/185/filelists/ppp b/config/rootfiles/oldcore/185/filelists/ppp similarity index 100% rename from config/rootfiles/core/185/filelists/ppp rename to config/rootfiles/oldcore/185/filelists/ppp diff --git a/config/rootfiles/core/185/filelists/qpdf b/config/rootfiles/oldcore/185/filelists/qpdf similarity index 100% rename from config/rootfiles/core/185/filelists/qpdf rename to config/rootfiles/oldcore/185/filelists/qpdf diff --git a/config/rootfiles/core/185/filelists/riscv64/binutils b/config/rootfiles/oldcore/185/filelists/riscv64/binutils similarity index 100% rename from config/rootfiles/core/185/filelists/riscv64/binutils rename to config/rootfiles/oldcore/185/filelists/riscv64/binutils diff --git a/config/rootfiles/core/185/filelists/riscv64/glibc b/config/rootfiles/oldcore/185/filelists/riscv64/glibc similarity index 100% rename from config/rootfiles/core/185/filelists/riscv64/glibc rename to config/rootfiles/oldcore/185/filelists/riscv64/glibc diff --git a/config/rootfiles/core/185/filelists/riscv64/util-linux b/config/rootfiles/oldcore/185/filelists/riscv64/util-linux similarity index 100% rename from config/rootfiles/core/185/filelists/riscv64/util-linux rename to config/rootfiles/oldcore/185/filelists/riscv64/util-linux diff --git a/config/rootfiles/core/185/filelists/shadow b/config/rootfiles/oldcore/185/filelists/shadow similarity index 100% rename from config/rootfiles/core/185/filelists/shadow rename to config/rootfiles/oldcore/185/filelists/shadow diff --git a/config/rootfiles/core/185/filelists/sqlite b/config/rootfiles/oldcore/185/filelists/sqlite similarity index 100% rename from config/rootfiles/core/185/filelists/sqlite rename to config/rootfiles/oldcore/185/filelists/sqlite diff --git a/config/rootfiles/core/185/filelists/squid b/config/rootfiles/oldcore/185/filelists/squid similarity index 100% rename from config/rootfiles/core/185/filelists/squid rename to config/rootfiles/oldcore/185/filelists/squid diff --git a/config/rootfiles/core/185/filelists/suricata b/config/rootfiles/oldcore/185/filelists/suricata similarity index 100% rename from config/rootfiles/core/185/filelists/suricata rename to config/rootfiles/oldcore/185/filelists/suricata diff --git a/config/rootfiles/core/185/filelists/tcl b/config/rootfiles/oldcore/185/filelists/tcl similarity index 100% rename from config/rootfiles/core/185/filelists/tcl rename to config/rootfiles/oldcore/185/filelists/tcl diff --git a/config/rootfiles/core/185/filelists/unbound b/config/rootfiles/oldcore/185/filelists/unbound similarity index 100% rename from config/rootfiles/core/185/filelists/unbound rename to config/rootfiles/oldcore/185/filelists/unbound diff --git a/config/rootfiles/core/185/filelists/wget b/config/rootfiles/oldcore/185/filelists/wget similarity index 100% rename from config/rootfiles/core/185/filelists/wget rename to config/rootfiles/oldcore/185/filelists/wget diff --git a/config/rootfiles/core/185/filelists/whois b/config/rootfiles/oldcore/185/filelists/whois similarity index 100% rename from config/rootfiles/core/185/filelists/whois rename to config/rootfiles/oldcore/185/filelists/whois diff --git a/config/rootfiles/core/185/filelists/x86_64/binutils b/config/rootfiles/oldcore/185/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/185/filelists/x86_64/binutils rename to config/rootfiles/oldcore/185/filelists/x86_64/binutils diff --git a/config/rootfiles/core/185/filelists/x86_64/glibc b/config/rootfiles/oldcore/185/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/185/filelists/x86_64/glibc rename to config/rootfiles/oldcore/185/filelists/x86_64/glibc diff --git a/config/rootfiles/core/185/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/185/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/185/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/185/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/185/filelists/x86_64/util-linux b/config/rootfiles/oldcore/185/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/185/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/185/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/185/filelists/xz b/config/rootfiles/oldcore/185/filelists/xz similarity index 100% rename from config/rootfiles/core/185/filelists/xz rename to config/rootfiles/oldcore/185/filelists/xz diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/oldcore/185/update.sh similarity index 100% rename from config/rootfiles/core/185/update.sh rename to config/rootfiles/oldcore/185/update.sh diff --git a/config/rootfiles/packages/cpufrequtils b/config/rootfiles/packages/cpufrequtils index d85e02867e..a058f370be 100644 --- a/config/rootfiles/packages/cpufrequtils +++ b/config/rootfiles/packages/cpufrequtils @@ -1,18 +1,2 @@ -usr/bin/cpufreq-aperf -usr/bin/cpufreq-info -usr/bin/cpufreq-set -#usr/include/cpufreq.h -#usr/lib/libcpufreq.a -#usr/lib/libcpufreq.la -usr/lib/libcpufreq.so -usr/lib/libcpufreq.so.0 -usr/lib/libcpufreq.so.0.0.0 -#usr/man/man1/cpufreq-info.1 -#usr/man/man1/cpufreq-set.1 -#usr/share/locale/cs/LC_MESSAGES/cpufrequtils.mo -usr/share/locale/de/LC_MESSAGES/cpufrequtils.mo -#usr/share/locale/fr/LC_MESSAGES/cpufrequtils.mo -#usr/share/locale/it/LC_MESSAGES/cpufrequtils.mo -#usr/share/locale/pt/LC_MESSAGES/cpufrequtils.mo etc/rc.d/init.d/cpufreq etc/rc.d/rc3.d/S18cpufreq diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi index 1946cf171d..217952578a 100644 --- a/html/cgi-bin/vulnerabilities.cgi +++ b/html/cgi-bin/vulnerabilities.cgi @@ -36,6 +36,7 @@ my %VULNERABILITIES = ( "mds" => "$Lang::tr{'fallout zombieload ridl'} (CVE-2018-12126, CVE-2018-12130, CVE-2018-12127, CVE-2019-11091)", "meltdown" => "$Lang::tr{'meltdown'} (CVE-2017-5754)", "mmio_stale_data" => "$Lang::tr{'mmio stale data'} (CVE-2022-21123, CVE-2022-21125, CVE-2022-21127, CVE-2022-21166)", + "reg_file_data_sampling" => "$Lang::tr{'reg_file_data_sampling'} (CVE-2023-28746)", "retbleed" => "$Lang::tr{'retbleed'} (CVE-2022-29900, CVE-2022-29901)", "spec_rstack_overflow" => "$Lang::tr{'spec rstack overflow'} (CVE-2023-20569)", "spec_store_bypass" => "$Lang::tr{'spectre variant 4'} (CVE-2018-3639)", diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0113f8811f..84370d9f17 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2212,6 +2212,7 @@ 'refresh' => 'Refresh', 'refresh index page while connected' => 'Refresh index.cgi page while connected', 'refresh update list' => 'Refresh update list', +'reg_file_data_sampling' => 'Register File Data Sampling (RFDS)', 'regenerate host certificate' => 'Renew Host Certificate', 'registered user rules' => 'Talos VRT rules for registered users', 'reiserfs warning1' => 'Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.', diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index 8db0e67508..0383834b64 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -24,17 +24,17 @@
include Config
-SUMMARY = Tools to Determine and Set CPUfreq Settings +SUMMARY = compatiblity initscript to set ondemand/powersave gov via cpupower
-VER = 008 +VER = ipfire
THISAPP = cpufrequtils-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) +#DL_FILE = $(THISAPP).tar.bz2 +#DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cpufrequtils -PAK_VER = 14 +PAK_VER = 15
DEPS =
@@ -44,54 +44,26 @@ SERVICES = # Top-level Rules ###############################################################################
-objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 4543e0aa7fa5db8ce47db63d1770614c46ac4b2519162c2c0122d2156518d2741dc31888b89f1fce4b530c04497c9fa5bf4ac073f078828383a4cc433cc8301c
install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects)) +check :
-download :$(patsubst %,$(DIR_DL)/%,$(objects)) +download :
-b2 : $(subst %,%_BLAKE2,$(objects)) +b2 :
dist: @$(PAK)
-############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - ############################################################################### # Installation Details ###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0007-po-add-missing-word-in-DE.patch - - cd $(DIR_APP) && make - cd $(DIR_APP) && make install
#install initscripts $(call INSTALL_INITSCRIPTS,cpufreq)
- @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index efd3e8533f..369e94dc1a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 6.6.15 +VER = 6.6.22
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7 +$(DL_FILE)_BLAKE2 = cea542524dbaea79c27e602b3e0534b5b95243ded95abdcab48f7ab1daf5f6de7231b24d2bc42e52fa27f98be9237534fb92f27ff1ba847df72e363b6147d3ab
install : $(TARGET)
@@ -247,6 +247,11 @@ ifeq "$(LASTKERNEL)" "1"
# Disable ipv6 at runtime echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf + + # build cpupower utility + cd $(DIR_APP)/tools/power/cpupower && make $(MAKETUNING) + cd $(DIR_APP)/tools/power/cpupower && make install + endif endif
diff --git a/make.sh b/make.sh index 64dbef5c4b..1006383bf1 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.29" # Version number -CORE="185" # Core Level (Filename) +CORE="186" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop diff --git a/src/initscripts/packages/cpufreq b/src/initscripts/packages/cpufreq index 303eaf4bf4..ce71a4621c 100644 --- a/src/initscripts/packages/cpufreq +++ b/src/initscripts/packages/cpufreq @@ -54,16 +54,9 @@ case "${1}" in echo_ok; ;; esac - CPUCOUNT=`ls /sys/devices/system/cpu/cpu*/cpufreq/affected_cpus 2> /dev/null | wc -l `; - let CPUCOUNT-=1 - # Set the governor to test if it works - cpufreq-set -g $GOV + # Set the governor + cpupower frequency-set -g $GOV >/dev/null if [ ${?} = 0 ]; then - # Set the governor to ondemand for all cpus - for i in `seq 0 $CPUCOUNT`; - do - cpufreq-set -c $i -g $GOV > /dev/null - done echo_ok; else echo_failure;
hooks/post-receive -- IPFire 2.x development tree