X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=c8a1560c747519f7bc95c1a960a71f51c5341351;hb=52758d52c33cffe678312fc6b8f4f20e36a66211;hp=aaded841ebe81999315d7eeaea3b3a52ce59110b;hpb=b358af5bfe08ea732ed0d05ebb0a6bb1f28b7983;p=ipfire-2.x.git

diff --git a/lfs/linux b/lfs/linux
index aaded841eb..c8a1560c74 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 5.10.39
-ARM_PATCHES = 5.10.39-ipfire0
+VER         = 5.10.55
+ARM_PATCHES = 5.10.55-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -48,7 +48,7 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 	KERNEL_TARGET = Image
 endif
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "armv6l"
 	KERNEL_ARCH  = arm
 	KERNEL_TARGET = zImage
 endif
@@ -58,6 +58,7 @@ VERSUFIX=ipfire$(KCFG)
 ifeq "$(TOOLCHAIN)" "1"
 	TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
 	HEADERS_PREFIX = $(TOOLS_DIR)
+	EXTRAMAKE = CROSS_COMPILE=$(CROSSTARGET)-
 else
 	TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
 	HEADERS_PREFIX = /usr
@@ -66,9 +67,6 @@ endif
 ifeq "$(KCFG)" ""
 LASTKERNEL=1
 endif
-ifeq "$(KCFG)" "-multi"
-LASTKERNEL=1
-endif
 
 ###############################################################################
 # Top-level Rules
@@ -79,8 +77,8 @@ 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)_MD5					= 8539c4a22530444032da79f1f36e618d
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 1cd3f5335b73e94b379c2057d9465bb8
+$(DL_FILE)_MD5					= 10d3f47caac28cf126e6d98ad977b2bb
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 8344fdeb190912cf32482dc6d51fba31
 
 install : $(TARGET)
 
@@ -140,7 +138,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# fix Boot with enabled usercopy hardening
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.9-crypto_testmgr_allocate_buffers_with____GFP_COMP.patch
 
-ifeq "$(KCFG)" "-multi"
+	# fix gcc plugins with gcc11
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.10.45-fix_gcc_plugins_with_gcc11.patch
+
+ifeq "$(BUILD_ARCH)" "armv6l"
 	# Apply Arm-multiarch kernel patches.
 	cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
 endif
@@ -152,7 +153,7 @@ endif
 
 ifeq "$(KCFG)" "-headers"
 	# Install the header files
-	cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) headers
+	cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) $(EXTRAMAKE) headers
 	-mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include
 	cd $(DIR_APP) && find usr/include -name '.*' -delete
 	cd $(DIR_APP) && rm usr/include/Makefile