Merge remote-tracking branch 'ms/ipsec-subnets' into next

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

diff --git a/lfs/linux b/lfs/linux
index 8b4f941128768c3fc1ebead6c2ec8caea42c2f33..fe74ad1e1171bbcf8820b6eec2c11b397b0b3b20 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 3.14.39
+VER         = 3.14.53
+RPI_PATCHES = 3.14.53-grsec-ipfire1
+A7M_PATCHES = 3.14.53-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1ipfire-3.14.53-v1.patch.xz
 
-RPI_PATCHES = 3.14.39-grsec-ipfire1
-A7M_PATCHES = 3.14.39-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1-3.14.39-201504190814.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -37,9 +37,15 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 59
+PAK_VER    = 63
 DEPS      = ""
 
+KERNEL_ARCH = $(MACHINE)
+
+ifeq "$(MACHINE)" "i586"
+       KERNEL_ARCH = i386
+endif
+
 VERSUFIX=ipfire$(KCFG)
 
 ifeq "$(TOOLS)" "1"
@@ -77,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz         = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)                                 = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                                 = 3581855d0dbfcbe1140dfcd1406d0a91
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = 5056304af0a199194abd0bcb00015f28
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc
-$(GRS_PATCHES)_MD5                             = 2121d0bf825da9ff6321e2940f247c5e
+$(DL_FILE)_MD5                                 = 5c5d18ddcc80b008826c2f43b322a34a
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = de5350ee7c3e4aa82289916963796fd9
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 25fc733bb657a84eea338104f88bcf70
+$(GRS_PATCHES)_MD5                             = 4c1f6e73f04bfc92b105afff24d0308c
 
 install : $(TARGET)
 
@@ -152,7 +158,7 @@ endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
 
        # Add PC Engines APU led support
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-apu_leds.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-apu_leds.patch
 
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
@@ -161,6 +167,9 @@ endif
        # r8169 L23 patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.32-r8169_disable_L23.patch
 
+       # update the queued trim blacklist from kernel 4.2rc1
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.43_new_qtrim_blacklist.patch
+
        # HyperV 2008 patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-hyperv-2008-fix.patch
 
@@ -219,7 +228,7 @@ ifeq "$(KCFG)" "-rpi"
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/kernel.img
 else
        cd $(DIR_APP) && make $(MAKETUNING) bzImage modules
-       cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+       cd $(DIR_APP) && cp -v arch/$(KERNEL_ARCH)/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 endif
 endif
 endif