aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-06-04 11:21:06 -0400
committerAnthony G. Basile <blueness@gentoo.org>2016-06-04 11:21:06 -0400
commit9925136e53bffa3844015741ba1dabae03a48a65 (patch)
tree69d756233278444112b02575eb1cd8b4a3eab182
parenttools-{musl,uclibc}: keyword =sys-devel/gcc-config-1.8-r1 and =dev-libs/libin... (diff)
downloadreleng-9925136e53bffa3844015741ba1dabae03a48a65.tar.gz
releng-9925136e53bffa3844015741ba1dabae03a48a65.tar.bz2
releng-9925136e53bffa3844015741ba1dabae03a48a65.zip
tools-musl: correct portage_confdir for hardened amd64 and armv7a
-rw-r--r--tools-musl/portage.amd64.hardened/package.accept_keywords (renamed from tools-musl/portage.amd64.vanilla/package.accept_keywords)0
-rw-r--r--tools-musl/portage.armv7a.hardened/package.accept_keywords1
-rwxr-xr-xtools-musl/run.sh11
3 files changed, 1 insertions, 11 deletions
diff --git a/tools-musl/portage.amd64.vanilla/package.accept_keywords b/tools-musl/portage.amd64.hardened/package.accept_keywords
index 6a816089..6a816089 100644
--- a/tools-musl/portage.amd64.vanilla/package.accept_keywords
+++ b/tools-musl/portage.amd64.hardened/package.accept_keywords
diff --git a/tools-musl/portage.armv7a.hardened/package.accept_keywords b/tools-musl/portage.armv7a.hardened/package.accept_keywords
new file mode 100644
index 00000000..6a816089
--- /dev/null
+++ b/tools-musl/portage.armv7a.hardened/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gcc-config-1.8-r1 ~amd64
diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index cbd9b875..e84e6a62 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -52,17 +52,6 @@ main() {
prepare_confs ${arch} ${flavor}
done
done
-
- # The parallelization `( do_stages ... ) &` doesn't work here
- # if catalyst is using snapcache, bug #519656
- for arch in amd64 i686; do
- for flavor in hardened vanilla; do
- (
- do_stages ${arch} ${flavor}
- [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
- ) &
- done
- done
}
main $1 &