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 CEB78138334 for ; Sun, 16 Sep 2018 15:24:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CE46E0AD8; Sun, 16 Sep 2018 15:23:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 2165FE0AD8 for ; Sun, 16 Sep 2018 15:23:58 +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 0690A335CCB for ; Sun, 16 Sep 2018 15:23:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EE283C6 for ; Sun, 16 Sep 2018 15:23:55 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1537111406.f2398d0b731cfbfddacdf90ce62a57b81f8607ec.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-ppc.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f2398d0b731cfbfddacdf90ce62a57b81f8607ec X-VCS-Branch: master Date: Sun, 16 Sep 2018 15:23:55 +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: f61c4f57-810f-410d-969d-3436821d5b5c X-Archives-Hash: f39ca4e8ef920f05240832196e3b4afe commit: f2398d0b731cfbfddacdf90ce62a57b81f8607ec Author: Matt Turner gentoo org> AuthorDate: Sun Sep 16 15:23:26 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Sep 16 15:23:26 2018 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f2398d0b catalyst-auto: Build ppc and ppc64 stages from catalyst-auto-ppc.conf tools/catalyst-auto-ppc.conf | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index c5d09d09..656ee88d 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -1,14 +1,14 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc32 +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc -SPECS="stage1.spec stage3.spec" +SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec" #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" #SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" #SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" -OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" +OPTIONAL_SPECS="ppc/installcd-stage1.spec ppc/installcd-stage2-minimal.spec" KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc @@ -36,12 +36,16 @@ convert_filename() { update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc" ; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do pushd "${d}" >/dev/null for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) ln -sf "${f}" "${of}" done + for f in $(ls stage3-ppc64-*xz | grep -v latest | give_latest_from_dates) ; do + local of=$(echo "${f}" | convert_filename) + ln -sf "${f}" "${of}" + done popd >/dev/null done } @@ -56,9 +60,15 @@ post_build() { pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null case ${spec} in - stage3.spec) + ppc/installcd-stage2-minimal.spec) + upload *${TIMESTAMP}*.iso* + ;; + ppc/stage3.spec) upload stage3-ppc-*${TIMESTAMP}*.xz* ;; + ppc64/stage3.spec) + upload stage3-ppc64-*${TIMESTAMP}*.xz* + ;; esac popd >/dev/null