firewall-lib.pl: Use get_geoip_locations from geoip-functions.pl

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

diff --git a/lfs/linux b/lfs/linux
index 48e703a1284f6148af9badbd0856390f3b5d1fec..645ebb9e16179141c1027c35e7e2d9b4691e15a3 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.83
-ARM_PATCHES = 4.14.83-ipfire0
+VER         = 4.14.86
+ARM_PATCHES = 4.14.86-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -82,8 +82,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                                 = a162c153de6516a885c955701b447968
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = a0d291aaf6d4be7df23a0df3850681de
+$(DL_FILE)_MD5                                 = 9ffeff88ca630a6e0ef0257b0a05b8c4
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 36b8a9adb8915cbccd18069e2f5af159
 
 install : $(TARGET)
 
@@ -157,10 +157,13 @@ endif
 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) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
+
 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) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
@@ -208,14 +211,14 @@ ifeq "$(LASTKERNEL)" "1"
        echo install drm /bin/false > /etc/modprobe.d/framebuffer.conf
 
        # Blacklist old framebuffer modules
-       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko); do \
+       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko.xz); do \
                echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
        done
        # Blacklist new drm framebuffer modules
-       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko); do \
+       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    
-       sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
+       sed -i -e "s|.ko.xz||g" /etc/modprobe.d/framebuffer.conf
 
        # Disable ipv6 at runtime
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf