diff options
author | 2018-10-05 07:40:04 -0400 | |
---|---|---|
committer | 2018-10-05 07:40:04 -0400 | |
commit | 4cabd6acedc5f444e4778b6db6a90308ac301db5 (patch) | |
tree | a405648bc0d76206b9902a6810099e05e7fc6e62 | |
parent | tools-musl: sys-libs/pam needs cracklib (diff) | |
download | releng-4cabd6acedc5f444e4778b6db6a90308ac301db5.tar.gz releng-4cabd6acedc5f444e4778b6db6a90308ac301db5.tar.bz2 releng-4cabd6acedc5f444e4778b6db6a90308ac301db5.zip |
tools-uclibc: update arm build for new 17.0 profiles
4 files changed, 18 insertions, 9 deletions
diff --git a/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/iproute2 b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/iproute2 new file mode 100644 index 00000000..219f7431 --- /dev/null +++ b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/iproute2 @@ -0,0 +1 @@ +=sys-apps/iproute2-4.18.0 ~arm diff --git a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/iproute2 b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/iproute2 new file mode 100644 index 00000000..219f7431 --- /dev/null +++ b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/iproute2 @@ -0,0 +1 @@ +=sys-apps/iproute2-4.18.0 ~arm diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh index 695a985c..d2fb9e23 100755 --- a/tools-uclibc/run-armv7a.sh +++ b/tools-uclibc/run-armv7a.sh @@ -13,24 +13,24 @@ prepare_confs() { [[ $p == 0 ]] && p=3 local pstage=stage${p} local tarch="${arch%_hardfp}" - local parch="arm/${tarch}" + local parch="arm" local float [[ "${arch}" == "${tarch}" ]] \ - && float="softfp" \ - || float="hardfloat" + && float="" \ + || float="hf" local profile=${flavor} - [[ "${flavor}" == "vanilla" ]] && profile="default" + [[ "${flavor}" == "vanilla" ]] && profile="" || profile="/hardened" - cat stage-all.conf.template | \ + cat stage.conf.template | \ sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ -e "s:CSTAGE:${cstage}:g" \ -e "s:PSTAGE:${pstage}:g" \ -e "s:SARCH:${arch}:g" \ -e "s:PARCH:${parch}:g" \ -e "s:TARCH:${tarch}:g" \ - -e "s:gentoo-linux-uclibc:${float}-linux-uclibceabi:" \ + -e "s:gentoo-linux-uclibc:unknown-linux-uclibceabi${float}:" \ -e "s:FLAVOR:${flavor}:g" \ -e "s:PROFILE:${profile}:g" \ -e "s:MYCATALYST:$(pwd):g" \ @@ -46,8 +46,6 @@ prepare_confs() { main() { - >zzz.log - catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err # for arch in armv7a_hardfp armv7a; do @@ -57,7 +55,7 @@ main() { done done - # No parallelization for arm. Its too hard on the cpu! +# No parallelization for arm. Its too hard on the cpu! # for arch in armv7a_hardfp armv7a; do for arch in armv7a_hardfp; do for flavor in hardened vanilla; do diff --git a/tools-uclibc/stage.conf.template b/tools-uclibc/stage.conf.template new file mode 100644 index 00000000..c3bc1f6f --- /dev/null +++ b/tools-uclibc/stage.conf.template @@ -0,0 +1,9 @@ +subarch: SARCH +target: CSTAGE +version_stamp: uclibc-FLAVOR +rel_type: uclibc/FLAVOR/SARCH +profile: default/linux/PARCH/17.0/uclibc/TARCHPROFILE +snapshot: current +source_subpath: uclibc/FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR +chost: TARCH-gentoo-linux-uclibc +portage_confdir: MYCATALYST/portage.SARCH.FLAVOR |