commit: b8c1579463674ecd1c0ac76f2d043ea7cdb1c0e2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 21:31:00 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> 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 <dilfridge <AT> 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' "$@"
[email protected]:
+ 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
