Merge branch 'next' into temp-c168-development

2026-04-21 08:22:59 +02:00 · 2022-04-23 14:23:04 +00:00
parent 0676b7b777 7e6efc89ea
commit 1f326847a3
13 changed files with 37 additions and 17 deletions
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.32-ipfire Kernel Configuration
+# Linux/arm64 5.15.35-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -7559,8 +7559,8 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_SAFESETID is not set
 CONFIG_SECURITY_LOCKDOWN_LSM=y
 CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE is not set
-CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY=y
+CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_SECURITY_LANDLOCK is not set
 CONFIG_INTEGRITY=y
--- a/config/kernel/kernel.config.armv6l-ipfire
+++ b/config/kernel/kernel.config.armv6l-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.32-ipfire Kernel Configuration
+# Linux/arm 5.15.35-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -7565,8 +7565,8 @@ CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 # CONFIG_SECURITY_SAFESETID is not set
 CONFIG_SECURITY_LOCKDOWN_LSM=y
 CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE is not set
-CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY=y
+CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_SECURITY_LANDLOCK is not set
 CONFIG_INTEGRITY=y
--- a/config/kernel/kernel.config.riscv64-ipfire
+++ b/config/kernel/kernel.config.riscv64-ipfire
@@ -6197,8 +6197,8 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_SAFESETID is not set
 CONFIG_SECURITY_LOCKDOWN_LSM=y
 CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE is not set
-CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY=y
+CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_SECURITY_LANDLOCK is not set
 CONFIG_INTEGRITY=y
--- 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 5.15.32-ipfire Kernel Configuration
+# Linux/x86 5.15.35-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -6975,8 +6975,8 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_SAFESETID is not set
 CONFIG_SECURITY_LOCKDOWN_LSM=y
 CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE is not set
-CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY=y
+CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_SECURITY_LANDLOCK is not set
 CONFIG_INTEGRITY=y
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -8327,7 +8327,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/LOCKDEP_SUPPORT
 #lib/modules/KVER-ipfire/build/include/config/LOCKD_V4
 #lib/modules/KVER-ipfire/build/include/config/LOCK_DEBUGGING_SUPPORT
-#lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_INTEGRITY
+#lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_NONE
 #lib/modules/KVER-ipfire/build/include/config/LOCK_SPIN_ON_OWNER
 #lib/modules/KVER-ipfire/build/include/config/LOGO
 #lib/modules/KVER-ipfire/build/include/config/LOGO_LINUX_CLUT224
@@ -13915,6 +13915,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/llcc-qcom.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/mdt_loader.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/pdr.h
+#lib/modules/KVER-ipfire/build/include/linux/soc/qcom/qcom_aoss.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/qmi.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/smd-rpm.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/smem.h
--- a/config/rootfiles/common/armv6l/linux
+++ b/config/rootfiles/common/armv6l/linux
@@ -8694,7 +8694,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/LOCKDEP_SUPPORT
 #lib/modules/KVER-ipfire/build/include/config/LOCKD_V4
 #lib/modules/KVER-ipfire/build/include/config/LOCK_DEBUGGING_SUPPORT
-#lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_INTEGRITY
+#lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_NONE
 #lib/modules/KVER-ipfire/build/include/config/LOCK_SPIN_ON_OWNER
 #lib/modules/KVER-ipfire/build/include/config/LOGO
 #lib/modules/KVER-ipfire/build/include/config/LOGO_LINUX_CLUT224
@@ -14365,6 +14365,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/llcc-qcom.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/mdt_loader.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/pdr.h
+#lib/modules/KVER-ipfire/build/include/linux/soc/qcom/qcom_aoss.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/qmi.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/smd-rpm.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/smem.h
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -8415,7 +8415,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/LOCKD_V4
 #lib/modules/KVER-ipfire/build/include/config/LOCKUP_DETECTOR
 #lib/modules/KVER-ipfire/build/include/config/LOCK_DEBUGGING_SUPPORT
-#lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_INTEGRITY
+#lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_NONE
 #lib/modules/KVER-ipfire/build/include/config/LOCK_EVENT_COUNTS
 #lib/modules/KVER-ipfire/build/include/config/LOCK_SPIN_ON_OWNER
 #lib/modules/KVER-ipfire/build/include/config/LOGO
@@ -14352,6 +14352,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/llcc-qcom.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/mdt_loader.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/pdr.h
+#lib/modules/KVER-ipfire/build/include/linux/soc/qcom/qcom_aoss.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/qmi.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/smd-rpm.h
 #lib/modules/KVER-ipfire/build/include/linux/soc/qcom/smem.h
--- a/config/rootfiles/oldcore/167/filelists/pcmciautils
+++ b/config/rootfiles/oldcore/167/filelists/pcmciautils
@@ -0,0 +1 @@
+../../../common/pcmciautils
--- a/config/rootfiles/oldcore/167/filelists/xfsprogs
+++ b/config/rootfiles/oldcore/167/filelists/xfsprogs
@@ -0,0 +1 @@
+../../../common/xfsprogs
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -70,6 +70,10 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	# https://bugzilla.ipfire.org/show_bug.cgi?id=12842
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-059-fix-e2fsck-call.patch
+
 	cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@

 include Config

-VER         = 5.15.32
+VER         = 5.15.35
 ARM_PATCHES = 5.15-ipfire5

 THISAPP    = linux-$(VER)
@@ -78,7 +78,7 @@ objects =$(DL_FILE) \
 $(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 = 37db43d3fae8d56cfc9b4f9bd3a76f450b401cbe643c89191de4ab442cc0910fa2d67f2cddd2069d517fb426f6437ff7e05b43ff2a314da04f883d25e354dff2
+$(DL_FILE)_BLAKE2 = 15f1af609ae4a233dc6bdae84c1231c2335be6320ddbb9a5d76c7983498a9ca72c13b55cc1408dac477f707fb84df99435994c1a7eeb91396481c2f7b11ecc2e
 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0

 install : $(TARGET)
--- a/src/misc-progs/ipfirereboot.c
+++ b/src/misc-progs/ipfirereboot.c
@@ -29,7 +29,7 @@

 /* define operations */
 #define OP_REBOOT    	  "boot"
-#define OP_REBOOT_FS 	  "bootfs" // add filesystem check option (not yet in GUI)
+#define OP_REBOOT_FS 	  "bootfs"
 #define OP_SHUTDOWN  	  "down"

 int main(int argc, char**argv)
--- a/src/patches/dracut-059-fix-e2fsck-call.patch
+++ b/src/patches/dracut-059-fix-e2fsck-call.patch
@@ -0,0 +1,11 @@
+--- dracut-056.orig/modules.d/99fs-lib/fs-lib.sh	2022-04-23 09:50:21.617018447 +0000
+++ dracut-056/modules.d/99fs-lib/fs-lib.sh	2022-04-23 09:50:35.750018142 +0000
+@@ -107,7 +107,7 @@
+ 
+     info "issuing $_drv $_fop $_dev"
+     # we enforce non-interactive run, so $() is fine
+-    _out=$($_drv "$_fop" "$_dev")
+    _out=$($_drv $_fop "$_dev")
+     _ret=$?
+     fsck_tail
+