Merge remote-tracking branch 'origin/next' into kernel-4.14

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

diff --git a/lfs/linux b/lfs/linux
index 659986da75b6330a4b9b90ffc94ace345b51635e..6f9b0919a8c3f9c908133bbcdd368e288f8cb1cb 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 4.14.1
+VER         = 4.14.2
 RPI_PATCHES = 3.14.79-grsec-ipfire1
 A7M_PATCHES = 3.14.79-grsec-ipfire1
 
@@ -55,7 +55,7 @@ VERSUFIX=ipfire$(KCFG)
 
 ifeq "$(TOOLCHAIN)" "1"
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
-       HEADERS_PREFIX = /tools
+       HEADERS_PREFIX = $(TOOLS_DIR)
 else
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
        HEADERS_PREFIX = /usr
@@ -79,7 +79,7 @@ $(DL_FILE)                                    = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz            = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 5de15914005314d964f37cff85a59048
+$(DL_FILE)_MD5                                 = 0164a000bd7b302037de4e91dff3018b
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = a02a7fd54c642c1e3578a00ed22f54f8
 arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 6c3b11e51caa278dbeacd1e23c2b171b