commit: 92e87a5425c9645fb0e8ed6be5b12cf4c547ca67 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sat Mar 3 08:43:06 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Mar 3 08:43:06 2018 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=92e87a54
tools-systemd: improve stage4 build step tools-systemd/common.sh | 4 +--- tools-systemd/run.sh | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh index d9570d05..bf52cd62 100644 --- a/tools-systemd/common.sh +++ b/tools-systemd/common.sh @@ -27,12 +27,10 @@ EOF do_stages() { local arch=$1 - for s in 1 2 3 4; do + for s in 1 2 3; do local tgpath="${storedir}/builds/systemd/${arch}" local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2" local tglink="stage${s}-${arch}-systemd.tar.bz2" - # only run the amd64 stage4 - [[ $arch == i686 ]] && [[ $s == 4 ]] && continue if [[ ! -f "${tgpath}/${tglink}" ]]; then touch stage${s}-${arch}-systemd.log echo "!!! ${tglink} at ${tgpath} doesn't exist" \ diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh index 29869284..0f16c4d1 100755 --- a/tools-systemd/run.sh +++ b/tools-systemd/run.sh @@ -50,6 +50,8 @@ main() { do_stages ${arch} [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log done + + catalyst -f stage4-amd64-systemd.conf } main $1 &