From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE6791382C5 for ; Sat, 3 Mar 2018 08:43:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6F57E09B8; Sat, 3 Mar 2018 08:43:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A42D5E09B8 for ; Sat, 3 Mar 2018 08:43:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B37B335C0C for ; Sat, 3 Mar 2018 08:43:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3B8C21D for ; Sat, 3 Mar 2018 08:43:12 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1520066586.92e87a5425c9645fb0e8ed6be5b12cf4c547ca67.blueness@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-systemd/ X-VCS-Repository: proj/releng X-VCS-Files: tools-systemd/common.sh tools-systemd/run.sh X-VCS-Directories: tools-systemd/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 92e87a5425c9645fb0e8ed6be5b12cf4c547ca67 X-VCS-Branch: master Date: Sat, 3 Mar 2018 08:43:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6b4827c8-7d09-4d10-ad34-2e907c8fd4c8 X-Archives-Hash: 383c0cb92852c1cd686aa37b3f8fb485 commit: 92e87a5425c9645fb0e8ed6be5b12cf4c547ca67 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Mar 3 08:43:06 2018 +0000 Commit: Anthony G. Basile gentoo 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 &