core166: Ship changes files

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

diff --git a/lfs/linux b/lfs/linux
index 7a7236eabfba588f1bc364a1e97d2238944e1ba0..346deb6f85003ca74f86ae7794e99c9c7da34d6e 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -49,6 +49,11 @@ ifeq "$(BUILD_ARCH)" "armv6l"
        KERNEL_TARGET = zImage
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+       KERNEL_ARCH   = riscv
+       KERNEL_TARGET = Image.gz
+endif
+
 VERSUFIX=ipfire$(KCFG)
 
 ifeq "$(TOOLCHAIN)" "1"
@@ -141,6 +146,9 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
+       # Fix for CVE-2022-0847 aka Dirty Pipe
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel-5.15-CVE-2022-0847.patch
+
 ifeq "$(KCFG)" "-headers"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) $(EXTRAMAKE) headers
@@ -241,7 +249,7 @@ ifeq "$(LASTKERNEL)" "1"
        # Blacklist new drm framebuffer modules
        for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko.xz); do \
                echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
-       done    
+       done
        sed -i -e "s|.ko.xz||g" /etc/modprobe.d/framebuffer.conf
 
        # Disable ipv6 at runtime