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 93A31138359 for ; Sat, 9 May 2020 21:41:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B68EAE083D; Sat, 9 May 2020 21:41:43 +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 925DBE083D for ; Sat, 9 May 2020 21:41:43 +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 4E1F134F0E7 for ; Sat, 9 May 2020 21:41:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C520219 for ; Sat, 9 May 2020 21:41:39 +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: <1589057922.635cc00fa9ca3d2abf61a5ca11aafcdc72547489.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-arm.conf tools/catalyst-auto-armv4tl.conf tools/catalyst-auto-armv5tel.conf tools/catalyst-auto-armv6j.conf tools/catalyst-auto-armv6j_hardfp.conf tools/catalyst-auto-armv7a.conf tools/catalyst-auto-armv7a_hardfp.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 635cc00fa9ca3d2abf61a5ca11aafcdc72547489 X-VCS-Branch: master Date: Sat, 9 May 2020 21:41:39 +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: 487a9ae3-6817-4fe5-a8b9-192c733b1685 X-Archives-Hash: 8cc24c510b2c5432412ec99bff2633ee commit: 635cc00fa9ca3d2abf61a5ca11aafcdc72547489 Author: Matt Turner gentoo org> AuthorDate: Sat May 9 20:43:43 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat May 9 20:58:42 2020 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=635cc00f tools: Combine arm configs Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto-arm.conf | 51 ++++++++++++++++++++++++++++++++++ tools/catalyst-auto-armv4tl.conf | 34 ----------------------- tools/catalyst-auto-armv5tel.conf | 34 ----------------------- tools/catalyst-auto-armv6j.conf | 34 ----------------------- tools/catalyst-auto-armv6j_hardfp.conf | 34 ----------------------- tools/catalyst-auto-armv7a.conf | 34 ----------------------- tools/catalyst-auto-armv7a_hardfp.conf | 34 ----------------------- 7 files changed, 51 insertions(+), 204 deletions(-) diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf new file mode 100644 index 00000000..96d75326 --- /dev/null +++ b/tools/catalyst-auto-arm.conf @@ -0,0 +1,51 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +REPO_DIR=/root/releng/ + +SPECS_DIR=${REPO_DIR}/releases/specs/arm + +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="[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 +} + + +upload() { + rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org: +} + +post_build() { + local set=$1 spec=$2 + + pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null + + case ${spec} in + armv4tl/stage3.spec) + upload stage3-armv4tl-${TIMESTAMP}*.xz* + ;; + armv5tel/systemd-stage3.spec) + upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* + ;; + armv6j_hardfp/stage3.spec) + upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz* + ;; + armv7a_hardfp/stage3.spec) + upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz* + ;; + esac + + popd >/dev/null +} diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf deleted file mode 100644 index e09b6cb8..00000000 --- a/tools/catalyst-auto-armv4tl.conf +++ /dev/null @@ -1,34 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -REPO_DIR=/root/releng/ - -SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv4tl -SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` - -SETS="default" - -SET_default_SPECS="stage1.spec stage2.spec stage3.spec" -#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" - -#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc - -EMAIL_SUBJECT_PREPEND="[${SUBARCH}-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 -} - - -post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org: -} diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf deleted file mode 100644 index 8daef964..00000000 --- a/tools/catalyst-auto-armv5tel.conf +++ /dev/null @@ -1,34 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -REPO_DIR=/root/releng/ - -SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv5tel -SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` - -SETS="default" - -SET_default_SPECS="stage1.spec stage2.spec stage3.spec" -#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" - -#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc - -EMAIL_SUBJECT_PREPEND="[${SUBARCH}-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 -} - - -post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org: -} diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf deleted file mode 100644 index a1d52f5d..00000000 --- a/tools/catalyst-auto-armv6j.conf +++ /dev/null @@ -1,34 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -REPO_DIR=/root/releng/ - -SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j -SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` - -SETS="default" - -SET_default_SPECS="stage1.spec stage2.spec stage3.spec" -#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" - -#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc - -EMAIL_SUBJECT_PREPEND="[${SUBARCH}-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 -} - - -post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org: -} diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf deleted file mode 100644 index 50bf09f7..00000000 --- a/tools/catalyst-auto-armv6j_hardfp.conf +++ /dev/null @@ -1,34 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -REPO_DIR=/root/releng/ - -SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j/hardfloat -SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` - -SETS="default" - -SET_default_SPECS="stage1.spec stage2.spec stage3.spec" -#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" - -#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc - -EMAIL_SUBJECT_PREPEND="[${SUBARCH}-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 -} - - -post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org: -} diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf deleted file mode 100644 index a4def3c7..00000000 --- a/tools/catalyst-auto-armv7a.conf +++ /dev/null @@ -1,34 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -REPO_DIR=/root/releng/ - -SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a -SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` - -SETS="default" - -SET_default_SPECS="stage1.spec stage2.spec stage3.spec" -#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" - -#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc - -EMAIL_SUBJECT_PREPEND="[${SUBARCH}-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 -} - - -post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org: -} diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf deleted file mode 100644 index ce7904a5..00000000 --- a/tools/catalyst-auto-armv7a_hardfp.conf +++ /dev/null @@ -1,34 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -REPO_DIR=/root/releng/ - -SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a/hardfloat -SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` - -SETS="default" - -SET_default_SPECS="stage1.spec stage2.spec stage3.spec" -#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" - -#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc - -EMAIL_SUBJECT_PREPEND="[${SUBARCH}-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 -} - - -post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org: -}