From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Dec 2015 22:25:18 +0000 (+0000)
Subject: linux: Fix build of kernel and headers package
X-Git-Tag: v2.19-core100~105
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ffea9709f83fae4f9b7e249d7f5cdc2501259607

linux: Fix build of kernel and headers package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/linux b/lfs/linux
index e1d6a4ecb9..2f762097fb 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -132,7 +132,6 @@ ifneq "$(KCFG)" "-headers"
 	cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
 	cd $(DIR_APP) && rm localversion-grsec
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel-grsec-compile-fixes.patch
 endif
 
 	# DVB Patches
@@ -198,6 +197,11 @@ ifeq "$(KCFG)" "-rpi"
 	cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
 endif
 
+	# Compile fixes
+ifeq "$(KCFG)" "-headers"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel-grsec-compile-fixes.patch
+endif
+
 ifeq "$(KCFG)" "-headers"
 	# Install the header files
 	cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install