| 1 |
commit: 189b629168125b18eb66ae3ff20f9379ddb08573 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 11 00:30:17 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 11 01:37:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=189b6291 |
| 7 |
|
| 8 |
tools-musl: improve armv7a/arm64 scripts |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
tools-musl/run-arm64.sh | 16 +++++++--------- |
| 13 |
tools-musl/run-armv7a.sh | 38 ++++++++++++-------------------------- |
| 14 |
2 files changed, 19 insertions(+), 35 deletions(-) |
| 15 |
|
| 16 |
diff --git a/tools-musl/run-arm64.sh b/tools-musl/run-arm64.sh |
| 17 |
index af6d49bd..200b33de 100755 |
| 18 |
--- a/tools-musl/run-arm64.sh |
| 19 |
+++ b/tools-musl/run-arm64.sh |
| 20 |
@@ -6,6 +6,8 @@ prepare_confs() { |
| 21 |
local flavor=$1 |
| 22 |
local arch="arm64" |
| 23 |
local tarch="aarch64" |
| 24 |
+ local profile="default/linux/arm64/17.0/musl" |
| 25 |
+ [[ "${flavor}" == "hardened" ]] && profile="${profile}/hardened" |
| 26 |
|
| 27 |
for s in 1 2 3; do |
| 28 |
local cstage=stage${s} |
| 29 |
@@ -13,9 +15,6 @@ prepare_confs() { |
| 30 |
[[ $p == 0 ]] && p=3 |
| 31 |
local pstage=stage${p} |
| 32 |
|
| 33 |
- local profile="default/linux/arm64/17.0/musl" |
| 34 |
- [[ "${flavor}" == "hardened" ]] && profile="${profile}/hardened" |
| 35 |
- |
| 36 |
cat stage.conf.template | \ |
| 37 |
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ |
| 38 |
-e "s:CSTAGE:${cstage}:g" \ |
| 39 |
@@ -43,17 +42,16 @@ prepare_confs() { |
| 40 |
main() { |
| 41 |
>zzz.log |
| 42 |
|
| 43 |
-# catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
| 44 |
+ catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
| 45 |
|
| 46 |
for flavor in hardened vanilla; do |
| 47 |
prepare_confs ${flavor} |
| 48 |
done |
| 49 |
|
| 50 |
- # No parallelization for arm64. Its too hard on the cpu! |
| 51 |
-# for flavor in hardened vanilla; do |
| 52 |
-# do_stages ${flavor} |
| 53 |
-# [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log |
| 54 |
-# done |
| 55 |
+ for flavor in hardened vanilla; do |
| 56 |
+ do_stages ${flavor} |
| 57 |
+ [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log |
| 58 |
+ done |
| 59 |
} |
| 60 |
|
| 61 |
main $1 & |
| 62 |
|
| 63 |
diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh |
| 64 |
index bec98577..bf5bd753 100755 |
| 65 |
--- a/tools-musl/run-armv7a.sh |
| 66 |
+++ b/tools-musl/run-armv7a.sh |
| 67 |
@@ -3,36 +3,27 @@ |
| 68 |
source common.sh |
| 69 |
|
| 70 |
prepare_confs() { |
| 71 |
- local arch=$1 |
| 72 |
- local flavor=$2 |
| 73 |
+ local flavor=$1 |
| 74 |
+ local arch="armv7a_hardfp" |
| 75 |
+ local tarch="armv7a" |
| 76 |
+ local profile="default/linux/arm/17.0/musl/armv7a" |
| 77 |
+ [[ "${flavor}" == "hardened" ]] && profile="${profile}/hardened" |
| 78 |
|
| 79 |
for s in 1 2 3; do |
| 80 |
- |
| 81 |
local cstage=stage${s} |
| 82 |
local p=$(( s - 1 )) |
| 83 |
[[ $p == 0 ]] && p=3 |
| 84 |
local pstage=stage${p} |
| 85 |
- local tarch="${arch%_hardfp}" |
| 86 |
- local parch="arm/${tarch}" |
| 87 |
- local float |
| 88 |
- |
| 89 |
- [[ "${arch}" == "${tarch}" ]] \ |
| 90 |
- && float="softfp" \ |
| 91 |
- || float="hardfloat" |
| 92 |
- |
| 93 |
- local profile=${flavor} |
| 94 |
- [[ "${flavor}" == "vanilla" ]] && profile="default" |
| 95 |
|
| 96 |
cat stage.conf.template | \ |
| 97 |
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ |
| 98 |
-e "s:CSTAGE:${cstage}:g" \ |
| 99 |
-e "s:PSTAGE:${pstage}:g" \ |
| 100 |
-e "s:SARCH:${arch}:g" \ |
| 101 |
- -e "s:PARCH:${parch}:g" \ |
| 102 |
-e "s:TARCH:${tarch}:g" \ |
| 103 |
- -e "s:gentoo-linux-musl:${float}-linux-musleabi:" \ |
| 104 |
-e "s:FLAVOR:${flavor}:g" \ |
| 105 |
- -e "s:PROFILE:${profile}:g" \ |
| 106 |
+ -e "s:gentoo-linux-musl:hardfloat-linux-musleabi:" \ |
| 107 |
+ -e "s:^profile\:.*:profile\: ${profile}:" \ |
| 108 |
-e "s:MYCATALYST:$(pwd):g" \ |
| 109 |
> stage${s}-${arch}-musl-${flavor}.conf |
| 110 |
|
| 111 |
@@ -57,18 +48,13 @@ main() { |
| 112 |
|
| 113 |
catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
| 114 |
|
| 115 |
- for arch in armv7a_hardfp; do |
| 116 |
- for flavor in hardened vanilla; do |
| 117 |
- prepare_confs ${arch} ${flavor} |
| 118 |
- done |
| 119 |
+ for flavor in hardened vanilla; do |
| 120 |
+ prepare_confs ${flavor} |
| 121 |
done |
| 122 |
|
| 123 |
- # No parallelization for arm. Its too hard on the cpu! |
| 124 |
- for arch in armv7a_hardfp; do |
| 125 |
- for flavor in hardened vanilla; do |
| 126 |
- do_stages ${arch} ${flavor} |
| 127 |
- [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log |
| 128 |
- done |
| 129 |
+ for flavor in hardened vanilla; do |
| 130 |
+ do_stages ${flavor} |
| 131 |
+ [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log |
| 132 |
done |
| 133 |
} |
Archives