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 93201138334 for ; Tue, 8 Jan 2019 17:18:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0E6BE07E2; Tue, 8 Jan 2019 17:18:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 9944BE07EE for ; Tue, 8 Jan 2019 17:18:57 +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 1765B335D00 for ; Tue, 8 Jan 2019 17:18:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4CC64E7 for ; Tue, 8 Jan 2019 17:18:49 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1546966946.a831d3f1499adc4eb04e113fe6a2bf5eef6bd79f.bkohler@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-sparc64.conf X-VCS-Directories: tools/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: a831d3f1499adc4eb04e113fe6a2bf5eef6bd79f X-VCS-Branch: master Date: Tue, 8 Jan 2019 17:18:49 +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: d6b9d46b-6691-4397-8122-b65d7f94d5c8 X-Archives-Hash: 7039631f5feea02c6a5c0396c829407e commit: a831d3f1499adc4eb04e113fe6a2bf5eef6bd79f Author: Ben Kohler gentoo org> AuthorDate: Tue Jan 8 17:02:26 2019 +0000 Commit: Ben Kohler gentoo org> CommitDate: Tue Jan 8 17:02:26 2019 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a831d3f1 catalyst-auto-sparc64.conf: redo post_build modeled after ppc Signed-off-by: Ben Kohler gentoo.org> tools/catalyst-auto-sparc64.conf | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index 570a0566..3a3e5f0e 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -46,22 +46,28 @@ update_symlinks() { done } +upload() { + rsync -e 'ssh -i /root/.ssh/id_rsa' + -a + --omit-dir-times + --delay-updates + "$@" + sparc@nightheron.gentoo.org: +} post_build() { - # We only want to do anything on the final (0 argument) post_build call - [ $# -eq 0 ] || return 0 - - mkdir -p ${TMPDIR}/empty - cmd=( - rsync - -e 'ssh -i /root/.ssh/id_rsa' - -a - --omit-dir-times - --delay-updates - ) - "${cmd[@]}" ${TMPDIR}/empty ${DEST} - "${cmd[@]}" \ - ${BUILD_SRCDIR_BASE}/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \ - ${BUILD_SRCDIR_BASE}/default/*${DATESTAMP}*.iso* \ - sparc@nightheron.gentoo.org: + local set=$1 spec=$2 + + pushd "${BUILD_SRCDIR_BASE}/default/" > /dev/null + + case ${spec} in + stage3.spec + upload stage3-*${DATESTAMP}*${EXTENSIONS}* + ;; + installcd-stage2-minimal.spec + upload *${DATESTAMP}*.iso* + ;; + esac + + popd > /dev/null }