commit:     9925136e53bffa3844015741ba1dabae03a48a65
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 15:21:06 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 15:21:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=9925136e

tools-musl: correct portage_confdir for hardened amd64 and armv7a

 .../package.accept_keywords                                   |  0
 .../package.accept_keywords                                   |  0
 tools-musl/run.sh                                             | 11 -----------
 3 files changed, 11 deletions(-)

diff --git a/tools-musl/portage.amd64.vanilla/package.accept_keywords 
b/tools-musl/portage.amd64.hardened/package.accept_keywords
similarity index 100%
copy from tools-musl/portage.amd64.vanilla/package.accept_keywords
copy to tools-musl/portage.amd64.hardened/package.accept_keywords

diff --git a/tools-musl/portage.amd64.vanilla/package.accept_keywords 
b/tools-musl/portage.armv7a.hardened/package.accept_keywords
similarity index 100%
rename from tools-musl/portage.amd64.vanilla/package.accept_keywords
rename to tools-musl/portage.armv7a.hardened/package.accept_keywords

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index cbd9b87..e84e6a6 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 &

Reply via email to