From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 29 Mar 2009 16:29:23 +0000 (+0200)
Subject: Enabled CONFIG_PAX_NOELFRELOCS.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bb4544c769aa697d5beff372780fa5a67093e0c;p=ipfire-3.x.git

Enabled CONFIG_PAX_NOELFRELOCS.
---

diff --git a/config/kernel/kernel.config b/config/kernel/kernel.config
index 2fb1b7656..c28b2dac2 100644
--- a/config/kernel/kernel.config
+++ b/config/kernel/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27.10
-# Sat Feb 28 22:04:24 2009
+# Sun Mar 29 15:11:28 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2784,7 +2784,7 @@ CONFIG_PAX_NOEXEC=y
 CONFIG_PAX_SEGMEXEC=y
 CONFIG_PAX_EMUTRAMP=y
 CONFIG_PAX_MPROTECT=y
-# CONFIG_PAX_NOELFRELOCS is not set
+CONFIG_PAX_NOELFRELOCS=y
 CONFIG_PAX_KERNEXEC=y
 
 #
diff --git a/lfs/linux b/lfs/linux
index 33b8eac4e..4d534ef91 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -159,15 +159,12 @@ ifeq "$(STAGE)" "ipfire"
 		cp -f $(DIR_CONF)/kernel/kernel.config $(DIR_APP)/.config; \
 	fi
 
-	# Fixed CFLAGS when using distcc
-	cd $(DIR_APP) && sed -e "s/-D__KERNEL__/& -fno-PIE/" -i Makefile
-
 	cd $(DIR_APP) && yes "" | make oldconfig
 
 	cd $(DIR_APP) && cp -vf $(DIR_CONFIG)/kernel/$(SNAME)_logo.ppm \
 		drivers/video/logo/logo_linux_clut224.ppm
 	
-	cd $(DIR_APP) && CC="gcc -U_FORTIFY_SOURCE" make $(PARALLELISMFLAGS)
+	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make modules_install
 	
 	cd $(DIR_APP) && cp -v arch/x86/boot/bzImage /boot/$(SNAME)kernel-$(FULLVER)