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 673701382C5 for ; Tue, 19 Jan 2021 21:31:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E868E076B; Tue, 19 Jan 2021 21:31:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 69CFCE076B for ; Tue, 19 Jan 2021 21:31:47 +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 068D3340FE6 for ; Tue, 19 Jan 2021 21:31:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6784E46B for ; Tue, 19 Jan 2021 21:31:43 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1611091888.b8c1579463674ecd1c0ac76f2d043ea7cdb1c0e2.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-arm.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: b8c1579463674ecd1c0ac76f2d043ea7cdb1c0e2 X-VCS-Branch: master Date: Tue, 19 Jan 2021 21:31:43 +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: 5e4fca95-22a5-445a-8cab-4d8ac6e09688 X-Archives-Hash: 97dffd4269e8cf4b2804dfdb0bb5f475 commit: b8c1579463674ecd1c0ac76f2d043ea7cdb1c0e2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Jan 19 21:31:00 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jan 19 21:31:28 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b8c15794 Update catalyst-auto-arm.conf from qemu copy Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-arm.conf | 100 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 80 insertions(+), 20 deletions(-) diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index 96d75326..85ff48e4 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -1,30 +1,66 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -REPO_DIR=/root/releng/ +ARCH="arm" +host=$(hostname) -SPECS_DIR=${REPO_DIR}/releases/specs/arm +SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH} -SPECS="armv4tl/stage1.spec armv4tl/stage3.spec armv5tel/stage1.spec armv5tel/stage3.spec armv6j/hardfloat/stage1.spec armv6j/hardfloat/stage3.spec armv7a/hardfloat/stage1.spec armv7a/hardfloat/stage3.spec" +EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]" + +SETS=" + armv4tl + armv5tel + armv6j_hf + armv6j_sf + armv7a_hf + armv7a_sf + armv4tl_systemd + armv5tel_systemd + armv6j_hf_systemd + armv6j_sf_systemd + armv7a_hf_systemd + armv7a_sf_systemd +" + +SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec" +SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" + +SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec" +SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec" + +SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec" +SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage3.spec" +SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec" +SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec" + +SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec" +SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.spec" +SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec" +SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec" -EMAIL_SUBJECT_PREPEND="[arm-auto]" update_symlinks() { - # Symlink the latest stages3 to build from - for d in ${BUILD_SRCDIR_BASE}/builds/default ; do - pushd $d >/dev/null - for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do - of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff - of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ - ln -sf $f $of - done - popd >/dev/null - done + # Symlink the latest stages3 to build from + local d f + for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do + pushd "${d}" >/dev/null + for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do + local of=$(echo "${f}" | convert_filename) + ln -sf "${f}" "${of}" + done + popd >/dev/null + done } - upload() { + if [[ ${nonetwork} == 0 ]]; then + echo Uploading "$@" rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org: + else + echo Would now upload "$@" + ls -l $@ + fi } post_build() { @@ -36,14 +72,38 @@ post_build() { armv4tl/stage3.spec) upload stage3-armv4tl-${TIMESTAMP}*.xz* ;; - armv5tel/systemd-stage3.spec) + armv4tl/stage3-systemd.spec) + upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz* + ;; + armv5tel/stage3.spec) + upload stage3-armv5tel-${TIMESTAMP}*.xz* + ;; + armv5tel/stage3-systemd.spec) upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* ;; - armv6j_hardfp/stage3.spec) - upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz* + armv6j/stage3.spec) + upload stage3-armv6j-${TIMESTAMP}*.xz* + ;; + armv6j/stage3-systemd.spec) + upload stage3-armv6j-systemd-${TIMESTAMP}*.xz* + ;; + armv6j/stage3-hardfloat.spec) + upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz* + ;; + armv6j/stage3-hardfloat-systemd.spec) + upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz* + ;; + armv7a/stage3.spec) + upload stage3-armv7a-${TIMESTAMP}*.xz* + ;; + armv7a/stage3-systemd.spec) + upload stage3-armv7a-systemd-${TIMESTAMP}*.xz* + ;; + armv7a/stage3-hardfloat.spec) + upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz* ;; - armv7a_hardfp/stage3.spec) - upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz* + armv7a/stage3-hardfloat-systemd.spec) + upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz* ;; esac