kernel: update to 6.6.8

[ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index 490feb8f06fe85339066607dee5820d79b9d68d0..0c17e2b2be76cec1b5296d9f76a14c70986530df 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,7 @@
 
 include Config
 
-VER         = 6.1.7
-ARM_PATCHES = 6.1.y-ipfire0
+VER         = 6.6.8
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -44,11 +43,6 @@ ifeq "$(BUILD_ARCH)" "aarch64"
        KERNEL_TARGET = Image
 endif
 
-ifeq "$(BUILD_ARCH)" "armv6l"
-       KERNEL_ARCH  = arm
-       KERNEL_TARGET = zImage
-endif
-
 ifeq "$(BUILD_ARCH)" "riscv64"
        KERNEL_ARCH   = riscv
        KERNEL_TARGET = Image.gz
@@ -72,14 +66,13 @@ endif
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects =$(DL_FILE) \
-       arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
-arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
+objects = \
+       $(DL_FILE)
+
+$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 13c970a5780fd4ed97a0ff5d7c13e2f5cfebf608199ae94973f3a8a109bb961f1effb45bd61a687f5faaf784a84b4c88b5a4bb75b7a1a943f44cab9b6ad37ce1
-arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 3ef9a778c5c41ee8bf2942a48f63b21228a632a2910d2123f01155bbf571592898cffffa61c387a5a6c817b62e458947b4c406c6591b23b5401faa47b020337f
+$(DL_FILE)_BLAKE2 = d6f58bfae29239f985c1aa329b19c2fdea1c08c79e819e60f85359e9ef00e97a7f72d74662df7d9def75ff85a3b4bdf36dc9ded578ee472e9b4efa7bf50fcd33
 
 install : $(TARGET)
 
@@ -116,7 +109,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -svf linux-$(VER) $(DIR_SRC)/linux
 
        # Layer7-patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.1-layer7.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.6-layer7.patch
 
        # DVB Patches
        cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
@@ -128,9 +121,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Fix igb and e1000e crash
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.1-igb-e1000e_fix_lock_at_update_stats.patch
 
-       # cs5535audio spams syslog if no ac97 was present (geos router)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch
-
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
@@ -146,16 +136,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Fix external module compile
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.0-fix_external_module_build.patch
 
-       # Fix pmc compile dependency errors
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.0.7-platform-x86-amd-Fix-pmc-compile-dependency-errors.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
 ifeq "$(BUILD_ARCH)" "aarch64"
-       # Apply Arm-multiarch kernel patches.
-       cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
+       # Apply Arm kernel patches.
+       cd $(DIR_APP) && cat patch $(DIR_SRC)/src/patches/linux/aarch64/* | patch -Np1
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
@@ -193,7 +176,7 @@ else
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && make $(MAKETUNING) modules_install
 
-ifeq "$(BUILD_PLATFORM)" "arm"
+ifneq "$(BUILD_PLATFORM)" "x86"
        cd $(DIR_APP) && make $(MAKETUNING) dtbs
        mkdir -p /boot/dtb-$(VER)-$(VERSUFIX)
        cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \