]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
kernel: headers still not build with grsec patch on i586.
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Nov 2014 06:48:05 +0000 (07:48 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Nov 2014 06:48:05 +0000 (07:48 +0100)
lfs/linux

index 383dac04a28b3a9a73f2a3cc1f2d6eb1acc88820..2e8a55895b09bbd2ecd6c7069034ff5baa3d95f5 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
@@ -174,7 +176,6 @@ ifeq "$(KCFG)" "-rpi"
        cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
 endif
 
-ifeq "$(KCFG)" "-headers"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
        -mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include
@@ -210,7 +211,6 @@ else
        cd $(DIR_APP) && make $(MAKETUNING) bzImage modules
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 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)