This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via aa6684235847375033842ab4ed99e22bcd9a13c2 (commit) from 98b8cabf4d80909b636e56a59091665798043f61 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit aa6684235847375033842ab4ed99e22bcd9a13c2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Dec 23 10:14:26 2015 +0100

kernel: apply arm-multi grsecurity fixes only at arm-multi build

-----------------------------------------------------------------------

Summary of changes: lfs/linux | 6 +----- ...rsec-compile-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%)

Difference in files: diff --git a/lfs/linux b/lfs/linux index 2f76209..1a0ae10 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/arm-multi-grsec-compile-fixes.patch b/src/patches/arm-multi-grsec-compile-fixes.patch new file mode 100644 index 0000000..530d69e --- /dev/null +++ b/src/patches/arm-multi-grsec-compile-fixes.patch @@ -0,0 +1,11 @@ +--- a/arch/arm/mach-omap2/cclock3xxx_data.c~ 2015-12-12 11:00:10.474423373 +0000 ++++ b/arch/arm/mach-omap2/cclock3xxx_data.c 2015-12-12 11:30:31.198452547 +0000 +@@ -250,7 +250,7 @@ + + static struct clk dpll1_ck; + +-static struct clk_ops dpll1_ck_ops; ++static clk_ops_no_const dpll1_ck_ops; + + static struct clk_ops dpll1_ck_ops_34xx __initdata = { + .init = &omap2_init_clk_clkdm, diff --git a/src/patches/kernel-grsec-compile-fixes.patch b/src/patches/kernel-grsec-compile-fixes.patch deleted file mode 100644 index 530d69e..0000000 --- a/src/patches/kernel-grsec-compile-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/arm/mach-omap2/cclock3xxx_data.c~ 2015-12-12 11:00:10.474423373 +0000 -+++ b/arch/arm/mach-omap2/cclock3xxx_data.c 2015-12-12 11:30:31.198452547 +0000 -@@ -250,7 +250,7 @@ - - static struct clk dpll1_ck; - --static struct clk_ops dpll1_ck_ops; -+static clk_ops_no_const dpll1_ck_ops; - - static struct clk_ops dpll1_ck_ops_34xx __initdata = { - .init = &omap2_init_clk_clkdm,

hooks/post-receive -- IPFire 2.x development tree