[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c27850183cce88fa26024be063a71a002bca5111

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c27850183cce88fa26024be063a71a002bca5111

[git]

[-- Attachment #1: Type: text/plain, Size: 3258 bytes --]

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  c27850183cce88fa26024be063a71a002bca5111 (commit)
       via  89df55b65049b4a5b408d409a5a00f5986e24c29 (commit)
      from  ba83f4b9ef340a6f07c0bf8b9400e53faf2fab23 (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 c27850183cce88fa26024be063a71a002bca5111
Merge: 89df55b ba83f4b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jan 16 22:00:53 2014 +0100

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 89df55b65049b4a5b408d409a5a00f5986e24c29
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jan 16 21:59:49 2014 +0100

    kernel: fix multi-arch kernel compile.

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

Summary of changes:
 lfs/linux                                                     |  3 +--
 ...-fs-exec-atomic64-operand-requires-impossible-reload.patch | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch

Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 68e91d4..ee754a2 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -122,11 +122,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Grsecurity-patches
 ifneq "$(KCFG)" "-headers"
-#ifneq "$(KCFG)" "-rpi"
 	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
 endif
 
 	# Disable pcspeaker autoload
@@ -161,6 +159,7 @@ ifeq "$(KCFG)" "-kirkwood"
 endif
 
 ifeq "$(KCFG)" "-multi"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch
 #	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0001-panda-wlan-fix.patch
 #	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0002-panda-i2c.patch
 #	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-panda-reboot.patch
diff --git a/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch b/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch
new file mode 100644
index 0000000..a829790
--- /dev/null
+++ b/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch
@@ -0,0 +1,11 @@
+--- a/fs/Makefile.orig	2014-01-16 20:17:03.000000000 +0000
++++ b/fs/Makefile	2014-01-16 20:25:05.000000000 +0000
+@@ -13,6 +13,8 @@
+ 		pnode.o splice.o sync.o utimes.o \
+ 		stack.o fs_struct.o statfs.o
+ 
++CFLAGS_exec.o += -O1
++
+ ifeq ($(CONFIG_BLOCK),y)
+ obj-y +=	buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
+ else


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