From 905d1afd4e7d30b9088e8c214248a76f5ff4ae72 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 13 Jan 2016 07:24:34 +0100 Subject: [PATCH 1/5] kernel: disable RANDSTRUCT RANDSRUCT is incompatible with ccache build. fixes #10905 fixes #11012 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 +-- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 +-- config/kernel/kernel.config.armv5tel-ipfire-rpi | 3 +-- config/kernel/kernel.config.i586-ipfire | 3 +-- config/kernel/kernel.config.i586-ipfire-pae | 3 +-- config/kernel/kernel.config.x86_64-ipfire | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 325add296..656a45105 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -5238,8 +5238,7 @@ CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y CONFIG_GRKERNSEC_HIDESYM=y -CONFIG_GRKERNSEC_RANDSTRUCT=y -CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y +# CONFIG_GRKERNSEC_RANDSTRUCT is not set CONFIG_GRKERNSEC_KERN_LOCKOUT=y # diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 9729903a7..4cab4b6e2 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -5726,8 +5726,7 @@ CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y CONFIG_GRKERNSEC_HIDESYM=y -CONFIG_GRKERNSEC_RANDSTRUCT=y -CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y +# CONFIG_GRKERNSEC_RANDSTRUCT is not set CONFIG_GRKERNSEC_KERN_LOCKOUT=y CONFIG_GRKERNSEC_OLD_ARM_USERLAND=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 6e584cbfd..798d883f5 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -3820,8 +3820,7 @@ CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y CONFIG_GRKERNSEC_HIDESYM=y -CONFIG_GRKERNSEC_RANDSTRUCT=y -CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y +# CONFIG_GRKERNSEC_RANDSTRUCT is not set CONFIG_GRKERNSEC_KERN_LOCKOUT=y CONFIG_GRKERNSEC_OLD_ARM_USERLAND=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 734bea684..7fc88628c 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -5731,8 +5731,7 @@ CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y CONFIG_GRKERNSEC_HIDESYM=y -CONFIG_GRKERNSEC_RANDSTRUCT=y -CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y +# CONFIG_GRKERNSEC_RANDSTRUCT is not set CONFIG_GRKERNSEC_KERN_LOCKOUT=y # diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index d6b5a7f5c..cccd702c1 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -5772,8 +5772,7 @@ CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y CONFIG_GRKERNSEC_HIDESYM=y -CONFIG_GRKERNSEC_RANDSTRUCT=y -CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y +# CONFIG_GRKERNSEC_RANDSTRUCT is not set CONFIG_GRKERNSEC_KERN_LOCKOUT=y # diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 09503d7f2..438b0d95f 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -5590,8 +5590,7 @@ CONFIG_GRKERNSEC_KSTACKOVERFLOW=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y CONFIG_GRKERNSEC_HIDESYM=y -CONFIG_GRKERNSEC_RANDSTRUCT=y -CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y +# CONFIG_GRKERNSEC_RANDSTRUCT is not set CONFIG_GRKERNSEC_KERN_LOCKOUT=y # From 6e96dd142aa6a54f970968c8a1bb2087aa8c6147 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 13 Jan 2016 19:04:56 +0100 Subject: [PATCH 2/5] toolchain: enable bootstrap and remove *.py files from lib. only with bootstrap the gcc pass2 build works on arm. Signed-off-by: Arne Fitzenreiter --- lfs/gcc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lfs/gcc b/lfs/gcc index ea8ef60f0..d28fa852f 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2016 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -106,7 +106,7 @@ ifeq "$(PASS)" "2" --enable-__cxa_atexit \ --enable-languages=c,c++ \ --disable-libstdcxx-pch \ - --disable-bootstrap + --enable-bootstrap EXTRA_MAKE = EXTRA_INSTALL = else @@ -289,6 +289,9 @@ ifeq "$(ROOT)" "" else ifeq "$(PASS)" "1" ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/') + + # remove gdb python files from libdir + rm -rf /tools/lib/*-gdb.py else ln -svf gcc /tools/bin/cc endif From 8f2ac12a87a1308c5e9adc7e7adb7150d5a1b364 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 14 Jan 2016 03:55:54 +0100 Subject: [PATCH 3/5] toolchain: move *.py remove to correct pass. Signed-off-by: Arne Fitzenreiter --- lfs/gcc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lfs/gcc b/lfs/gcc index d28fa852f..0c3a50ff0 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -289,11 +289,10 @@ ifeq "$(ROOT)" "" else ifeq "$(PASS)" "1" ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/') - - # remove gdb python files from libdir - rm -rf /tools/lib/*-gdb.py else ln -svf gcc /tools/bin/cc + # remove gdb python files from libdir + rm -rf /tools/lib/*-gdb.py endif endif @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build From 3da3ac98564bc97ba96bc2e10d5d6acb746a33de Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 14 Jan 2016 16:08:24 +0100 Subject: [PATCH 4/5] gcc: remove gdb python files also in root build. Signed-off-by: Arne Fitzenreiter --- lfs/gcc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lfs/gcc b/lfs/gcc index 0c3a50ff0..00f64c699 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -286,6 +286,8 @@ endif ifeq "$(ROOT)" "" ln -svf ../usr/bin/cpp /lib ln -svf gcc /usr/bin/cc + # remove gdb python files from libdir + rm -rf /usr/lib/*-gdb.py else ifeq "$(PASS)" "1" ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/') From 9b4f0e639705d87708b67038e11fc4f10cbe81e5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 15 Jan 2016 07:20:34 +0100 Subject: [PATCH 5/5] toolchain: bump version number Signed-off-by: Arne Fitzenreiter --- make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index 0b6953346..67320cf4b 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2015 IPFire Team . # +# Copyright (C) 2007-2016 IPFire Team . # # # ############################################################################ # @@ -36,7 +36,7 @@ BUILD_IMAGES=1 # Flash and Xen Downloader KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=10 +TOOLCHAINVER=11 # New architecture variables BUILD_ARCH="$(uname -m)"