From aa6684235847375033842ab4ed99e22bcd9a13c2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 23 Dec 2015 10:14:26 +0100 Subject: [PATCH] kernel: apply arm-multi grsecurity fixes only at arm-multi build --- lfs/linux | 6 +----- ...pile-fixes.patch => arm-multi-grsec-compile-fixes.patch} | 0 2 files changed, 1 insertion(+), 5 deletions(-) rename src/patches/{kernel-grsec-compile-fixes.patch => arm-multi-grsec-compile-fixes.patch} (100%) diff --git a/lfs/linux b/lfs/linux index 2f762097fb..1a0ae10c85 100644 --- a/lfs/linux +++ b/lfs/linux @@ -186,6 +186,7 @@ ifeq "$(KCFG)" "-multi" # Apply Arm7-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm7-multi-patches-$(A7M_PATCHES).patch.xz | patch -Np1 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-multi-grsec-compile-fixes.patch # Install switch api userspace header cd $(DIR_APP) && install -v -m644 include/uapi/linux/switch.h /usr/include/linux/ @@ -197,11 +198,6 @@ 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 diff --git a/src/patches/kernel-grsec-compile-fixes.patch b/src/patches/arm-multi-grsec-compile-fixes.patch similarity index 100% rename from src/patches/kernel-grsec-compile-fixes.patch rename to src/patches/arm-multi-grsec-compile-fixes.patch -- 2.39.2