aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2018-03-03 03:43:06 -0500
committerAnthony G. Basile <blueness@gentoo.org>2018-03-03 03:43:06 -0500
commit92e87a5425c9645fb0e8ed6be5b12cf4c547ca67 (patch)
treeb912ade338127aab80fb2b37b06ef354648c4547 /tools-systemd
parenttools-systemd: fix calculation of repo_dir (diff)
downloadreleng-92e87a5425c9645fb0e8ed6be5b12cf4c547ca67.tar.gz
releng-92e87a5425c9645fb0e8ed6be5b12cf4c547ca67.tar.bz2
releng-92e87a5425c9645fb0e8ed6be5b12cf4c547ca67.zip
tools-systemd: improve stage4 build step
Diffstat (limited to 'tools-systemd')
-rw-r--r--tools-systemd/common.sh4
-rwxr-xr-xtools-systemd/run.sh2
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 &