diff --git a/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc index e35046ca..f0a76ed5 100644 --- a/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc +++ b/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Version: 0.9.33.2 -# Wed Jul 9 19:33:11 2014 +# Tue Jul 15 17:11:45 2014 # # TARGET_alpha is not set # TARGET_arm is not set @@ -225,14 +225,14 @@ HARDWIRED_ABSPATH=y # # Security options # -# UCLIBC_BUILD_PIE is not set +UCLIBC_BUILD_PIE=y UCLIBC_HAS_ARC4RANDOM=y UCLIBC_HAS_SSP=y # UCLIBC_HAS_SSP_COMPAT is not set # SSP_QUICK_CANARY is not set # PROPOLICE_BLOCK_ABRT is not set PROPOLICE_BLOCK_SEGV=y -UCLIBC_BUILD_SSP=y +# UCLIBC_BUILD_SSP is not set UCLIBC_BUILD_RELRO=y UCLIBC_BUILD_NOW=y UCLIBC_BUILD_NOEXECSTACK=y diff --git a/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc index e35046ca..f0a76ed5 100644 --- a/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc +++ b/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Version: 0.9.33.2 -# Wed Jul 9 19:33:11 2014 +# Tue Jul 15 17:11:45 2014 # # TARGET_alpha is not set # TARGET_arm is not set @@ -225,14 +225,14 @@ HARDWIRED_ABSPATH=y # # Security options # -# UCLIBC_BUILD_PIE is not set +UCLIBC_BUILD_PIE=y UCLIBC_HAS_ARC4RANDOM=y UCLIBC_HAS_SSP=y # UCLIBC_HAS_SSP_COMPAT is not set # SSP_QUICK_CANARY is not set # PROPOLICE_BLOCK_ABRT is not set PROPOLICE_BLOCK_SEGV=y -UCLIBC_BUILD_SSP=y +# UCLIBC_BUILD_SSP is not set UCLIBC_BUILD_RELRO=y UCLIBC_BUILD_NOW=y UCLIBC_BUILD_NOEXECSTACK=y diff --git a/tools-uclibc/run-ppc.sh b/tools-uclibc/run-ppc.sh old mode 100644 new mode 100755 index e0019625..3fe44f44 --- a/tools-uclibc/run-ppc.sh +++ b/tools-uclibc/run-ppc.sh @@ -15,7 +15,7 @@ prepare_confs() { [[ $p == 0 ]] && p=3 local pstage=stage${p} - local tarch="${arch}" + local parch="${arch}" [[ "${arch}" == "ppc" ]] && tarch="powerpc" cat stage-all.conf.template | \ @@ -93,16 +93,18 @@ main() { done done -# for arch in ppc; do + for arch in ppc; do +# hardened is currently broken # for flavor in hardened vanilla; do -# do_stages ${arch} ${flavor} -# ret=$? -# if [[ $? == 1 ]]; then -# echo "FAILURE at ${arch} ${flavor} " | tee zzz.log -# return 1 -# fi -# done -# done + for flavor in vanilla; do + do_stages ${arch} ${flavor} + ret=$? + if [[ $? == 1 ]]; then + echo "FAILURE at ${arch} ${flavor} " | tee zzz.log + return 1 + fi + done + done } main $1 &