chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

catalyst-auto-sparc64.conf: stop hardcoding .tar.bz2, no multilib build

Browse source 
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>
This commit is contained in:
Ben Kohler 2018-12-31 16:42:11 -06:00
parent 09a85273a6
commit fdedd793b6
No known key found for this signature in database
GPG key ID: 7A85BDA4D57605C7
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/catalyst-auto-sparc64.conf
View file

@ -3,15 +3,17 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64 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_SPECS="stage1.spec stage2.spec stage3.spec"
SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
give_latest_from_dates() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\ sort -k +1 -n -t '~' |\
@ -27,7 +29,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
pushd $d >/dev/null 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=${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 $ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of ln -sf $f $of
@ -47,12 +49,8 @@ post_build() {
--delay-updates --delay-updates
) )
"${cmd[@]}" ${TMPDIR}/empty ${DEST} "${cmd[@]}" ${TMPDIR}/empty ${DEST}
"${cmd[@]}" ${TMPDIR}/empty ${DEST}/multilib
"${cmd[@]}" \ "${cmd[@]}" \
${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* \ ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \
${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \ ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \
sparc@nightheron.gentoo.org: sparc@nightheron.gentoo.org:
"${cmd[@]}" \
${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* \
sparc@nightheron.gentoo.org:multilib
} }