kernel: update to 4.14.40

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

diff --git a/lfs/linux b/lfs/linux
index 3885ff30e2c0d39164ac1935c5e5090cb5d60d3f..76e847813142b5d154324b137e1a3300f99b1d99 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,9 +24,8 @@
 
 include Config
 
-VER         = 4.14.27
-A7M_PATCHES = 3.14.79-grsec-ipfire1
-
+VER         = 4.14.40
+ARM_PATCHES = 4.14.40-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -63,7 +62,7 @@ endif
 ifeq "$(KCFG)" ""
 LASTKERNEL=1
 endif
-ifeq "$(KCFG)" "-kirkwood"
+ifeq "$(KCFG)" "-multi"
 LASTKERNEL=1
 endif
 
@@ -71,13 +70,13 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       arm7-multi-patches-$(A7M_PATCHES).patch.xz
+       arm-multi-patches-$(ARM_PATCHES).patch.xz
 
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
-arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
+arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 1320ac282002c3ef9967852efeab04f9
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 6c3b11e51caa278dbeacd1e23c2b171b
+$(DL_FILE)_MD5                                 = 8376ed89777760443a359edb1d08ed9a
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = ae7091bb79bad05c8394c8bacc48dd60
 
 install : $(TARGET)
 
@@ -128,10 +127,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-rt2x00usb_suppress_queue_warnings.patch
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
 
-       # mISDN Patches
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
-
        # Add LED trigger
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.16-ledtrig_netdev.patch
 
@@ -148,20 +143,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
 ifeq "$(KCFG)" "-kirkwood"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-smsc95xx-add_mac_addr_param.patch
-
-       # Apply Arm7-multiarch kernel patches.
-       cd $(DIR_APP) && xzcat $(DIR_DL)/arm7-multi-patches-$(A7M_PATCHES).patch.xz | patch -Np1
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-multi-grsec-compile-fixes.patch
-
-       # Install switch api userspace header
-       cd $(DIR_APP) && install -v -m644 include/uapi/linux/switch.h /usr/include/linux/
-
+       # Apply Arm-multiarch kernel patches.
+       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
 
@@ -184,14 +171,13 @@ else
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
 ifeq "$(KCFG)" "-kirkwood"
-       cd $(DIR_APP) && make $(MAKETUNING) uImage modules
-       cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
-       cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
+       cd $(DIR_APP) && make $(MAKETUNING) zImage modules
+       cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+#      cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
 else
 ifeq "$(KCFG)" "-multi"
        cd $(DIR_APP) && make $(MAKETUNING) zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
-       cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/zImage-$(VERSUFIX)
 else
        cd $(DIR_APP) && make $(MAKETUNING) bzImage modules
        cd $(DIR_APP) && cp -v arch/$(KERNEL_ARCH)/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
@@ -227,12 +213,6 @@ ifeq "$(LASTKERNEL)" "1"
        done    
        sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
 
-       # Blacklist isdn modules
-       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
-               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn.conf ; \
-       done
-       sed -i -e "s|.ko||g" /etc/modprobe.d/isdn.conf
-
        # Disable ipv6 at runtime
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
 endif