| 1 |
commit: fdedd793b64c881662d04bf7537165123d96ddcb |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 31 22:42:11 2018 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 3 14:30:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fdedd793 |
| 7 |
|
| 8 |
catalyst-auto-sparc64.conf: stop hardcoding .tar.bz2, no multilib build |
| 9 |
|
| 10 |
As has been done in other arches' specs, allow a list of different |
| 11 |
stage3 tarball extensions. Also disable building of multilib stages. |
| 12 |
|
| 13 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 14 |
|
| 15 |
tools/catalyst-auto-sparc64.conf | 14 ++++++-------- |
| 16 |
1 file changed, 6 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf |
| 19 |
index b3364f8f..e5e43846 100644 |
| 20 |
--- a/tools/catalyst-auto-sparc64.conf |
| 21 |
+++ b/tools/catalyst-auto-sparc64.conf |
| 22 |
@@ -3,15 +3,17 @@ |
| 23 |
|
| 24 |
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64 |
| 25 |
|
| 26 |
-SETS="default multilib" |
| 27 |
+SETS="default" |
| 28 |
|
| 29 |
SET_default_SPECS="stage1.spec stage2.spec stage3.spec" |
| 30 |
SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 31 |
|
| 32 |
-SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec" |
| 33 |
+#SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec" |
| 34 |
|
| 35 |
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc |
| 36 |
|
| 37 |
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" |
| 38 |
+ |
| 39 |
give_latest_from_dates() { |
| 40 |
sed 's,-20,~20,g' | \ |
| 41 |
sort -k +1 -n -t '~' |\ |
| 42 |
@@ -27,7 +29,7 @@ update_symlinks() { |
| 43 |
# Symlink the latest stages3 to build from |
| 44 |
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do |
| 45 |
pushd $d >/dev/null |
| 46 |
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do |
| 47 |
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
| 48 |
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
| 49 |
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
| 50 |
ln -sf $f $of |
| 51 |
@@ -47,12 +49,8 @@ post_build() { |
| 52 |
--delay-updates |
| 53 |
) |
| 54 |
"${cmd[@]}" ${TMPDIR}/empty ${DEST} |
| 55 |
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}/multilib |
| 56 |
"${cmd[@]}" \ |
| 57 |
- ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* \ |
| 58 |
+ ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \ |
| 59 |
${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \ |
| 60 |
sparc@×××××××××××××××××.org: |
| 61 |
- "${cmd[@]}" \ |
| 62 |
- ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* \ |
| 63 |
- sparc@×××××××××××××××××.org:multilib |
| 64 |
} |
Archives