From 1296f1b08183d803c17e54641e09e18c72d9cfa4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 4 Nov 2021 21:49:44 +0100 Subject: [PATCH] kernel: update to 5.15.0 todo add arm patches, configs and rootfiles Signed-off-by: Arne Fitzenreiter --- lfs/linux | 12 +++------ .../linux-5.10.16-apu1-led-new-bios.patch | 27 ------------------- ...x-5.10.45-fix_gcc_plugins_with_gcc11.patch | 27 ------------------- ...0-layer7.patch => linux-5.15-layer7.patch} | 24 ++++++++--------- 4 files changed, 15 insertions(+), 75 deletions(-) delete mode 100644 src/patches/linux/linux-5.10.16-apu1-led-new-bios.patch delete mode 100644 src/patches/linux/linux-5.10.45-fix_gcc_plugins_with_gcc11.patch rename src/patches/linux/{linux-5.10-layer7.patch => linux-5.15-layer7.patch} (99%) diff --git a/lfs/linux b/lfs/linux index 37271bc8f6..9985eed8ca 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 5.10.76 +VER = 5.15.0 ARM_PATCHES = 5.10.76-ipfire1 THISAPP = linux-$(VER) @@ -77,7 +77,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)_MD5 = 6d9d29908d48ffee0daab4f6f8d98a65 +$(DL_FILE)_MD5 = dbebca26baeeb943b8cf90ce188a0a39 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 02a75302a5b4a157e3d67ae62af6b178 install : $(TARGET) @@ -114,7 +114,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-5.10-layer7.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15-layer7.patch # DVB Patches cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch @@ -123,9 +123,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14_ath_user_regd.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch - # Fix apu1 led detection with newer bios versions - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.10.16-apu1-led-new-bios.patch - # 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 @@ -138,9 +135,6 @@ $(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 - # 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 diff --git a/src/patches/linux/linux-5.10.16-apu1-led-new-bios.patch b/src/patches/linux/linux-5.10.16-apu1-led-new-bios.patch deleted file mode 100644 index 572136d9fd..0000000000 --- a/src/patches/linux/linux-5.10.16-apu1-led-new-bios.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur linux-5.10.16.org/drivers/leds/leds-apu.c linux-5.10.16/drivers/leds/leds-apu.c ---- linux-5.10.16.org/drivers/leds/leds-apu.c 2021-02-13 13:55:19.000000000 +0100 -+++ linux-5.10.16/drivers/leds/leds-apu.c 2021-02-17 09:32:19.154531597 +0100 -@@ -90,6 +90,13 @@ - DMI_MATCH(DMI_PRODUCT_NAME, "APU") - } - }, -+ { -+ .ident = "apu", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "apu1") -+ } -+ }, - {} - }; - MODULE_DEVICE_TABLE(dmi, apu_led_dmi_table); -@@ -173,7 +180,8 @@ - int err; - - if (!(dmi_match(DMI_SYS_VENDOR, "PC Engines") && -- dmi_match(DMI_PRODUCT_NAME, "APU"))) { -+ dmi_match(DMI_PRODUCT_NAME, "APU")|| -+ dmi_match(DMI_PRODUCT_NAME, "apu1"))) { - pr_err("No PC Engines APUv1 board detected. For APUv2,3 support, enable CONFIG_PCENGINES_APU2\n"); - return -ENODEV; - } diff --git a/src/patches/linux/linux-5.10.45-fix_gcc_plugins_with_gcc11.patch b/src/patches/linux/linux-5.10.45-fix_gcc_plugins_with_gcc11.patch deleted file mode 100644 index f48239c6e6..0000000000 --- a/src/patches/linux/linux-5.10.45-fix_gcc_plugins_with_gcc11.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur linux-5.10.45.org/scripts/gcc-plugins/Makefile linux-5.10.45/scripts/gcc-plugins/Makefile ---- linux-5.10.45.org/scripts/gcc-plugins/Makefile 2021-06-18 10:00:06.000000000 +0200 -+++ linux-5.10.45/scripts/gcc-plugins/Makefile 2021-06-22 13:36:30.108527243 +0200 -@@ -22,9 +22,9 @@ - GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin) - - plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \ -- -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++98 \ -+ -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \ - -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \ -- -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \ -+ -ggdb -Wno-narrowing -Wno-unused-variable \ - -Wno-format-diag - - plugin_ldflags = -shared -diff -Naur linux-5.10.45.org/scripts/gcc-plugin.sh linux-5.10.45/scripts/gcc-plugin.sh ---- linux-5.10.45.org/scripts/gcc-plugin.sh 2021-06-18 10:00:06.000000000 +0200 -+++ linux-5.10.45/scripts/gcc-plugin.sh 2021-06-22 17:24:20.138602697 +0200 -@@ -8,7 +8,7 @@ - gccplugins_dir=$($* -print-file-name=plugin) - - # we need a c++ compiler that supports the designated initializer GNU extension --$HOSTCC -c -x c++ -std=gnu++98 - -fsyntax-only -I $srctree/gcc-plugins -I $gccplugins_dir/include 2>/dev/null </dev/null <