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 DE6351382C5 for ; Tue, 15 Dec 2020 23:19:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 235F8E0880; Tue, 15 Dec 2020 23:19:01 +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 05805E0880 for ; Tue, 15 Dec 2020 23:19:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B5645340E46 for ; Tue, 15 Dec 2020 23:18:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66A8256 for ; Tue, 15 Dec 2020 23:18:58 +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: <1608074318.a4eff6d6f0fff614fa4a39b681927346052bc72b.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-ppc64le.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a4eff6d6f0fff614fa4a39b681927346052bc72b X-VCS-Branch: master Date: Tue, 15 Dec 2020 23:18:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8d353937-c856-4b79-a09d-f83494cf6dd5 X-Archives-Hash: 6d979db07ced39ea570aa87860144aa3 commit: a4eff6d6f0fff614fa4a39b681927346052bc72b Author: Matt Turner gentoo org> AuthorDate: Tue Dec 15 23:18:38 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Dec 15 23:18:38 2020 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a4eff6d6 tools/ppc64le: Handle musl-hardened/ directory Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto-ppc64le.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf index 2379954a..06b98819 100644 --- a/tools/catalyst-auto-ppc64le.conf +++ b/tools/catalyst-auto-ppc64le.conf @@ -20,7 +20,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]" update_symlinks() { # Symlink the latest stages3 to build from local d f t - for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds-musl-hardened"; do pushd "${d}" >/dev/null for t in ppc64le; do for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do @@ -39,20 +39,20 @@ upload() { post_build() { local set=$1 spec=$2 - pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null case ${spec} in installcd-stage2-minimal.spec) - upload *${TIMESTAMP}*.iso* + upload default/*${TIMESTAMP}*.iso* ;; stage3*.spec) - upload stage3-ppc64le-${TIMESTAMP}*.xz* + upload default/stage3-ppc64le-${TIMESTAMP}*.xz* ;; systemd-stage3*.spec) - upload stage3-ppc64le-systemd-${TIMESTAMP}*.xz* + upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz* ;; musl-hardened-stage3*.spec) - upload stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz* + upload musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz* ;; esac