kernel: update to 4.14.138

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

diff --git a/lfs/linux b/lfs/linux
index c7a475553cf6d95ebef49fc52a4f461beec483a7..a9e30714f5404714f8484e6f0fc1c1a62283c69b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.121
-ARM_PATCHES = 4.14.121-ipfire0
+VER         = 4.14.138
+ARM_PATCHES = 4.14.138-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 83
+PAK_VER    = 86
 DEPS      = ""
 
 HEADERS_ARCH  = $(BUILD_PLATFORM)
@@ -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                                 = 619cfc35e376eaa1f05d835624bbb432
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = ac64bdb78fbecba032b92df61c928d3f
+$(DL_FILE)_MD5                                 = 00a16e1b1c6f295d236e5f82e20a0d2f
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = aac1fa091598028a8c27d64f206b6fca
 
 install : $(TARGET)
 
@@ -153,13 +153,10 @@ 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
 
@@ -181,6 +178,9 @@ else
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
+       # Remove modules folder if exists
+       rm -rf /lib/modules/$(VER)-$(VERSUFIX)
+
        # Build the kernel
        cd $(DIR_APP) && make $(MAKETUNING) $(KERNEL_TARGET) modules