kernel: update to 4.14.44

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

diff --git a/lfs/linux b/lfs/linux
index f5faaad5d29a53f957f0ae8c4962652868abacd8..1b5e91253c0be4713eab6b75823479b2d34d110d 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.31
-ARM_PATCHES = 4.14.31-ipfire0
+VER         = 4.14.44
+ARM_PATCHES = 4.14.44-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -70,13 +70,13 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       arm-multi-patches-$(ARM_PATCHES).tar.xz
+       arm-multi-patches-$(ARM_PATCHES).patch.xz
 
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
-arm-multi-patches-$(ARM_PATCHES).tar.xz        = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).tar.xz
+arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = a1ada8986b8501434e7011e6b2467a28
-arm-multi-patches-$(ARM_PATCHES).tar.xz_MD5    = eb4fd5da8748249d83c2ab77baaa5676
+$(DL_FILE)_MD5                                 = f899e4f755a6a23396115674fae81986
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 1d66d7f85b77d06da04d8421f92e0ab9
 
 install : $(TARGET)
 
@@ -127,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,11 +144,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 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/linux-4.14.40-kirkwood-dtb.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
        # Apply Arm-multiarch kernel patches.
-       cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).tar.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
 
@@ -217,12 +214,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