Merge remote-tracking branch 'origin/master' into aarch64

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

diff --git a/lfs/linux b/lfs/linux
index 5bd01ecbad6c3429bf6b249e75e78a8b1a0bff7a..4355daa9f7814f9628f6e61d4ea055c5aaee6f08 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.32
-ARM_PATCHES = 4.14.32-ipfire0
+VER         = 4.14.50
+ARM_PATCHES = 4.14.50-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 73
+PAK_VER    = 75
 DEPS      = ""
 
 ifeq "$(BUILD_ARCH)" "i586"
@@ -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                                 = d873b636e1fb8712f07d325885dc1d17
-arm-multi-patches-$(ARM_PATCHES).tar.xz_MD5    = b2e3b52f550abdb273224602f9f309a4
+$(DL_FILE)_MD5                                 = 0d397a2e14669a97d54c1b82ab2b1994
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = c38181f9fd416f10352e3dd3a01bb1d1
 
 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
 
@@ -180,8 +177,14 @@ ifeq "$(KCFG)" "-kirkwood"
 #      cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
 else
 ifeq "$(KCFG)" "-multi"
+ifeq "$(BUILD_ARCH)" "armv5tel"
        cd $(DIR_APP) && make $(MAKETUNING) zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+endif
+ifeq "$(BUILD_ARCH)" "aarch64"
+       cd $(DIR_APP) && make $(MAKETUNING) Image modules
+       cd $(DIR_APP) && cp -v arch/arm64/boot/Image /boot/vmlinuz-$(VER)-$(VERSUFIX)
+endif
 else
        cd $(DIR_APP) && make $(MAKETUNING) bzImage modules
        cd $(DIR_APP) && cp -v arch/$(KERNEL_ARCH)/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
@@ -194,9 +197,10 @@ endif
 
 ifeq "$(BUILD_PLATFORM)" "arm"
        cd $(DIR_APP) && make $(MAKETUNING) dtbs
-       cd $(DIR_APP) && for f in $$(find arch/arm/boot/dts/ -name *.dtb); do \
-                               mkdir -p /boot/dtb-$(VER)-$(VERSUFIX) ; \
-                               install -m 644 $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \
+       mkdir -p /boot/dtb-$(VER)-$(VERSUFIX)
+       cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \
+                               cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \
+                               chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \
                        done
 endif
 
@@ -217,12 +221,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