| 1 |
commit: 9925136e53bffa3844015741ba1dabae03a48a65 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 4 15:21:06 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 15:21:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9925136e |
| 7 |
|
| 8 |
tools-musl: correct portage_confdir for hardened amd64 and armv7a |
| 9 |
|
| 10 |
.../package.accept_keywords | 0 |
| 11 |
.../package.accept_keywords | 0 |
| 12 |
tools-musl/run.sh | 11 ----------- |
| 13 |
3 files changed, 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/tools-musl/portage.amd64.vanilla/package.accept_keywords b/tools-musl/portage.amd64.hardened/package.accept_keywords |
| 16 |
similarity index 100% |
| 17 |
copy from tools-musl/portage.amd64.vanilla/package.accept_keywords |
| 18 |
copy to tools-musl/portage.amd64.hardened/package.accept_keywords |
| 19 |
|
| 20 |
diff --git a/tools-musl/portage.amd64.vanilla/package.accept_keywords b/tools-musl/portage.armv7a.hardened/package.accept_keywords |
| 21 |
similarity index 100% |
| 22 |
rename from tools-musl/portage.amd64.vanilla/package.accept_keywords |
| 23 |
rename to tools-musl/portage.armv7a.hardened/package.accept_keywords |
| 24 |
|
| 25 |
diff --git a/tools-musl/run.sh b/tools-musl/run.sh |
| 26 |
index cbd9b87..e84e6a6 100755 |
| 27 |
--- a/tools-musl/run.sh |
| 28 |
+++ b/tools-musl/run.sh |
| 29 |
@@ -52,17 +52,6 @@ main() { |
| 30 |
prepare_confs ${arch} ${flavor} |
| 31 |
done |
| 32 |
done |
| 33 |
- |
| 34 |
- # The parallelization `( do_stages ... ) &` doesn't work here |
| 35 |
- # if catalyst is using snapcache, bug #519656 |
| 36 |
- for arch in amd64 i686; do |
| 37 |
- for flavor in hardened vanilla; do |
| 38 |
- ( |
| 39 |
- do_stages ${arch} ${flavor} |
| 40 |
- [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log |
| 41 |
- ) & |
| 42 |
- done |
| 43 |
- done |
| 44 |
} |
| 45 |
|
| 46 |
main $1 & |
Archives