Merge remote-tracking branch 'mfischer/python' into next

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

diff --git a/lfs/linux b/lfs/linux
index d92bdfee301be269b2a6ac49af3ad877dd868363..b2d2552dc848200fec573a8c6e2c022a579a62b9 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 3.14.32
+VER        = 3.14.41
 
-RPI_PATCHES = 3.14.32-grsec-ipfire1
-A7M_PATCHES = 3.14.32-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.0-3.14.32-201502062101.patch.xz
+RPI_PATCHES = 3.14.41-grsec-ipfire1
+A7M_PATCHES = 3.14.41-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1-3.14.41-201505072056.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 58
+PAK_VER    = 59
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -77,10 +77,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                                 = 3178fb8f6f1eafcffdd730fec68754f8
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = 375dc501711ff3ffeffdfc9848675d26
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = efcfe5889f120d879387dd4ebe881587
-$(GRS_PATCHES)_MD5                             = c1565eb2a630a673f3ace31a6901e251
+$(DL_FILE)_MD5                                 = b28dfc6907c388c2adcc65aee2ad68ff
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = 9c8b20647429a64d656999a3c7af890f
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc
+$(GRS_PATCHES)_MD5                             = 8af3b27954311da581cc6f803f048779
 
 install : $(TARGET)
 
@@ -118,9 +118,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Linux Intermediate Queueing Device
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-imq.patch
 
-       # ipp2p 0.8.2-ipfire
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-ipp2p-0.8.2-ipfire.patch
-
        # Layer7-patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-layer7-filter.patch
 
@@ -164,6 +161,9 @@ endif
        # r8169 L23 patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.32-r8169_disable_L23.patch
 
+       # HyperV 2008 patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-hyperv-2008-fix.patch
+
 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-3.14.22-kirkwood_legacy_boot.patch
@@ -175,11 +175,9 @@ ifeq "$(KCFG)" "-multi"
        # Apply Arm7-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm7-multi-patches-$(A7M_PATCHES).patch.xz | patch -Np1
 
-       # Update Banana Pi, Lamobo-R1 and add Banana Pro dtb
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-update_banana_dts.patch
-
        # Install switch api userspace header
        cd $(DIR_APP) && install -v -m644 include/uapi/linux/switch.h /usr/include/linux/
+
 endif
 
 ifeq "$(KCFG)" "-rpi"