kernel: update to 4.14.183

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

diff --git a/lfs/linux b/lfs/linux
index 8c28c26dc01cdc5c128956b97df6fd4b36d2f74d..b71f0ead3879955e7382598ac0b5e0d7e55698d4 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.170
-ARM_PATCHES = 4.14.170-ipfire0
+VER         = 4.14.183
+ARM_PATCHES = 4.14.183-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,9 +34,6 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 90
-DEPS      = ""
-
 HEADERS_ARCH  = $(BUILD_PLATFORM)
 KERNEL_ARCH   = $(BUILD_ARCH)
 KERNEL_TARGET = bzImage
@@ -82,8 +79,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                                 = 2e3d6daa02e422f2387e7d2352e6aca8
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 2bf7ce33777ca17fd0cc8ab6c137c656
+$(DL_FILE)_MD5                                 = bd6db02bdbe35609756842b8c4c72cad
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 55f6b8d709919adb8791e507836ceedc
 
 install : $(TARGET)
 
@@ -143,8 +140,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
-       # Fix for netfilter nf_conntrack: resolve clash for matching conntracks
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.0-netfilter-conntrack-resolve-clash.patch
+       # Active try to add entropy if the kernel wait for it
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-random_try_to_actively_add_entropy.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.x-add_timer_setup_on_stack.patch
 
 ifeq "$(KCFG)" "-kirkwood"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
@@ -178,6 +176,9 @@ else
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
+       # Copy Module signing key configuration
+       cp -f $(DIR_SRC)/config/kernel/x509.genkey $(DIR_APP)/certs/x509.genkey
+
        # Remove modules folder if exists
        rm -rf /lib/modules/$(VER)-$(VERSUFIX)
 
@@ -219,6 +220,9 @@ endif
        cd $(DIR_APP) && cp -a --parents arch/$(HEADERS_ARCH)/include /lib/modules/$(VER)-$(VERSUFIX)/build
        cd $(DIR_APP) && cp -a include /lib/modules/$(VER)-$(VERSUFIX)/build/include
 
+       # Copy module signing key for off tree modules
+       cd $(DIR_APP) && cp -f certs/signing_key.* /lib/modules/$(VER)-$(VERSUFIX)/build/certs/
+
        # Install objtool
        cd $(DIR_APP) && cp -a tools/objtool/objtool \
                /lib/modules/$(VER)-$(VERSUFIX)/build/tools/objtool/ || :