aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2018-12-31 16:42:11 -0600
committerBen Kohler <bkohler@gentoo.org>2019-01-03 08:30:24 -0600
commitfdedd793b64c881662d04bf7537165123d96ddcb (patch)
treed981fef722ad64029a55b6866001a52af2bf34b0
parenttools-uclibc: keyword sys-apps/iproute2-4.19.0-r1 (diff)
downloadreleng-fdedd793b64c881662d04bf7537165123d96ddcb.tar.gz
releng-fdedd793b64c881662d04bf7537165123d96ddcb.tar.bz2
releng-fdedd793b64c881662d04bf7537165123d96ddcb.zip
catalyst-auto-sparc64.conf: stop hardcoding .tar.bz2, no multilib build
As has been done in other arches' specs, allow a list of different stage3 tarball extensions. Also disable building of multilib stages. Signed-off-by: Ben Kohler <bkohler@gentoo.org>
-rw-r--r--tools/catalyst-auto-sparc64.conf14
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index b3364f8f..e5e43846 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -3,15 +3,17 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64
-SETS="default multilib"
+SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec"
+#SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -27,7 +29,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
pushd $d >/dev/null
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | 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
@@ -47,12 +49,8 @@ post_build() {
--delay-updates
)
"${cmd[@]}" ${TMPDIR}/empty ${DEST}
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}/multilib
"${cmd[@]}" \
- ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* \
+ ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \
${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \
sparc@nightheron.gentoo.org:
- "${cmd[@]}" \
- ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* \
- sparc@nightheron.gentoo.org:multilib
}