| 1 |
commit: 92e87a5425c9645fb0e8ed6be5b12cf4c547ca67 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 3 08:43:06 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 3 08:43:06 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=92e87a54 |
| 7 |
|
| 8 |
tools-systemd: improve stage4 build step |
| 9 |
|
| 10 |
tools-systemd/common.sh | 4 +--- |
| 11 |
tools-systemd/run.sh | 2 ++ |
| 12 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh |
| 15 |
index d9570d05..bf52cd62 100644 |
| 16 |
--- a/tools-systemd/common.sh |
| 17 |
+++ b/tools-systemd/common.sh |
| 18 |
@@ -27,12 +27,10 @@ EOF |
| 19 |
do_stages() { |
| 20 |
local arch=$1 |
| 21 |
|
| 22 |
- for s in 1 2 3 4; do |
| 23 |
+ for s in 1 2 3; do |
| 24 |
local tgpath="${storedir}/builds/systemd/${arch}" |
| 25 |
local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2" |
| 26 |
local tglink="stage${s}-${arch}-systemd.tar.bz2" |
| 27 |
- # only run the amd64 stage4 |
| 28 |
- [[ $arch == i686 ]] && [[ $s == 4 ]] && continue |
| 29 |
if [[ ! -f "${tgpath}/${tglink}" ]]; then |
| 30 |
touch stage${s}-${arch}-systemd.log |
| 31 |
echo "!!! ${tglink} at ${tgpath} doesn't exist" \ |
| 32 |
|
| 33 |
diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh |
| 34 |
index 29869284..0f16c4d1 100755 |
| 35 |
--- a/tools-systemd/run.sh |
| 36 |
+++ b/tools-systemd/run.sh |
| 37 |
@@ -50,6 +50,8 @@ main() { |
| 38 |
do_stages ${arch} |
| 39 |
[[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log |
| 40 |
done |
| 41 |
+ |
| 42 |
+ catalyst -f stage4-amd64-systemd.conf |
| 43 |
} |
| 44 |
|
| 45 |
main $1 & |
Archives