From 0bb82a95dd383912bde857db9a7d702604e582f6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 28 Jul 2023 18:04:25 +0200 Subject: [PATCH 1/4] initskripts: remove buggy remount at halt and reboot mount -f does nothing and also the sync calls should do nothing on a already ro mounted filesystem. fixes: #13195 Signed-off-by: Arne Fitzenreiter Signed-off-by: Michael Tremer --- config/rootfiles/core/177/filelists/files | 2 ++ src/initscripts/system/halt | 5 ----- src/initscripts/system/reboot | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/core/177/filelists/files b/config/rootfiles/core/177/filelists/files index e9ba30a0c..5f0034d81 100644 --- a/config/rootfiles/core/177/filelists/files +++ b/config/rootfiles/core/177/filelists/files @@ -1,3 +1,5 @@ +etc/rc.d/init.d/halt +etc/rc.d/init.d/reboot lib/firmware/amd-ucode/microcode_amd_fam17h.bin lib/firmware/amd-ucode/microcode_amd_fam19h.bin lib/firmware/amdgpu/aldebaran_mec2.bin diff --git a/src/initscripts/system/halt b/src/initscripts/system/halt index 91c89455c..40a72ac7d 100644 --- a/src/initscripts/system/halt +++ b/src/initscripts/system/halt @@ -24,11 +24,6 @@ case "${1}" in stop) - sync && sync - boot_mesg "Remount root readonly..." - mount -f -o remount,ro / > /dev/null 2>&1 - evaluate_retval - boot_mesg "Prepare for halt..." sleep 2 diff --git a/src/initscripts/system/reboot b/src/initscripts/system/reboot index 30c504025..f87f12921 100644 --- a/src/initscripts/system/reboot +++ b/src/initscripts/system/reboot @@ -24,10 +24,6 @@ case "${1}" in stop) - sync && sync - boot_mesg "Remount root readonly..." - mount -f -o remount,ro / > /dev/null 2>&1 - evaluate_retval boot_mesg "Prepare for reboot..." sleep 2 reboot -d -f -i From 8ffe9b67de2fad230ea28200cd5c5b79d586c793 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 28 Jul 2023 18:19:16 +0200 Subject: [PATCH 2/4] core177: remove rngd if the addon was not installed via pakfire the old version is linked against the old openssl and will fail. fixes: #13197 Signed-off-by: Arne Fitzenreiter Signed-off-by: Michael Tremer --- config/rootfiles/core/177/update.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh index 818079940..2347afbdb 100644 --- a/config/rootfiles/core/177/update.sh +++ b/config/rootfiles/core/177/update.sh @@ -97,6 +97,15 @@ rm -f \ /opt/pakfire/db/meta/meta-squidclamav \ /opt/pakfire/db/rootfiles/squidclamav +# remove old rngd if the addon is not installed +if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then + rm -rf /usr/bin/randstat \ + /usr/bin/rngtest \ + /usr/sbin/rngd \ + /etc/rc.d/init.d/rngd \ + /etc/rc.d/rc?.d/*rmgd +fi + # Extract files extract_files @@ -168,3 +177,4 @@ sync # Don't report the exitcode last command exit 0 + From d4781c29aeb8f5ae2323c445142e48b303fd09e5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 28 Jul 2023 16:21:12 +0000 Subject: [PATCH 3/4] core177: Fix typo in removing rngd init links Signed-off-by: Michael Tremer --- config/rootfiles/core/177/update.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh index 2347afbdb..52ef205b0 100644 --- a/config/rootfiles/core/177/update.sh +++ b/config/rootfiles/core/177/update.sh @@ -99,11 +99,11 @@ rm -f \ # remove old rngd if the addon is not installed if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then - rm -rf /usr/bin/randstat \ + rm -fv /usr/bin/randstat \ /usr/bin/rngtest \ /usr/sbin/rngd \ /etc/rc.d/init.d/rngd \ - /etc/rc.d/rc?.d/*rmgd + /etc/rc.d/rc?.d/*rngd fi # Extract files @@ -177,4 +177,3 @@ sync # Don't report the exitcode last command exit 0 - From 6084fa89bfe8e65592b8e3a74b21470585332736 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 28 Jul 2023 18:30:21 +0200 Subject: [PATCH 4/4] kernel: update to 6.1.42 Signed-off-by: Arne Fitzenreiter Signed-off-by: Michael Tremer --- config/kernel/kernel.config.x86_64-ipfire | 2 +- lfs/linux | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 32fcb18c4..a5ad9700f 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.1.41-ipfire Kernel Configuration +# Linux/x86 6.1.42-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y diff --git a/lfs/linux b/lfs/linux index 4aa8c08cb..2160482ca 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.1.41 +VER = 6.1.42 ARM_PATCHES = 6.1.y-ipfire2 THISAPP = linux-$(VER) @@ -75,7 +75,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_BLAKE2 = 7b67b16cb45e8089a4554c59e5be29fef39acd95013345752f5e57af4f185cc79a5effb13741f643d7a9ef2c99555342cfeb1e859f38303be800d889a35972fe +$(DL_FILE)_BLAKE2 = 27d506867a44764ca5fb71d36a1732ded064b8d24d2d53bd1b2158db53cc82283a390b46071ed0cd07fdd68a0fd60486e5ec231fc6247f87bc0bea9692d449f9 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3 install : $(TARGET)