From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 15 May 2021 13:33:19 +0000 (+0000)
Subject: kernel: update to 5.10.37
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=5a27051fc27864b725fbe8333424f3a8c9364e62

kernel: update to 5.10.37

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index cbf4273e56..3ff7c5a4f5 100644
--- 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.10.32-ipfire Kernel Configuration
+# Linux/arm64 5.10.37-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 08edf45d75..1ba75ad329 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.10.32-ipfire-multi Kernel Configuration
+# Linux/arm 5.10.37-ipfire-multi Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 0f2477a348..3bdcc1f70a 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.32-ipfire Kernel Configuration
+# Linux/x86 5.10.37-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 711aa6ed35..c321471553 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 5.10.32-ipfire Kernel Configuration
+# Linux/x86 5.10.37-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi
index 747f51f868..11828bf060 100644
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -633,6 +633,7 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-m1.dtb
 #boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-neo-air.dtb
 #boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-neo.dtb
+#boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-r1.dtb
 #boot/dtb-KVER-ipfire-multi/sun8i-h3-orangepi-2.dtb
 #boot/dtb-KVER-ipfire-multi/sun8i-h3-orangepi-lite.dtb
 #boot/dtb-KVER-ipfire-multi/sun8i-h3-orangepi-one.dtb
@@ -660,7 +661,7 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca5s.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca9.dtb
 #boot/dtb-KVER-ipfire-multi/xenvm-4.2.dtb
-#boot/vmlinuz-KVER-ipfire-multi
+boot/vmlinuz-KVER-ipfire-multi
 etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
 #lib/modules
diff --git a/lfs/linux b/lfs/linux
index ce30cfd989..654eb16a42 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 5.10.35
-ARM_PATCHES = 4.14.212-ipfire0
+VER         = 5.10.37
+ARM_PATCHES = 5.10.37-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -79,8 +79,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					= 9a5aa5a479f493ace963371856d03c34
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 2b0e8e3ebe9827b2bfed7397b043dbc5
+$(DL_FILE)_MD5					= 637c3ec580111cd1f6614b6d6b91bd94
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= b9a5bc93c1122cc7da51da06c71f4805
 
 install : $(TARGET)
 
@@ -142,11 +142,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(KCFG)" "-multi"
 	# Apply Arm-multiarch kernel patches.
-#	cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
+	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
+	cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
 endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch