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

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

diff --git a/lfs/linux b/lfs/linux
index 383dac04a28b3a9a73f2a3cc1f2d6eb1acc88820..2644711c9543ce3a2eb1587914b0641589d08072 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -124,10 +124,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Layer7-patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-layer7-filter.patch
 
+ifneq "$(KCFG)" "-headers"
        # Grsecurity-patches
        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
+endif
 
        # DVB Patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch
@@ -212,6 +214,7 @@ else
 endif
 endif
 endif
+
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && make $(MAKETUNING) modules_install
@@ -225,7 +228,6 @@ ifeq "$(MACHINE_TYPE)" "arm"
                        done
 endif
 
-
 ifeq "$(LASTKERNEL)" "1"
        # Only do this once
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/