commit: 0d88b842623fae95f7ac6e1111e566d8650a6319 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu May 30 21:04:14 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu May 30 21:10:25 2019 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0d88b842
catalyst-auto: Use xz instead of bz2 for s390 builds Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> tools/catalyst-auto-s390.conf | 10 +++++----- tools/catalyst-auto-s390x.conf | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index b42797dc..30d78e76 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -24,9 +24,9 @@ give_latest_from_dates() { # Replace the date/time stamp in the filename to "latest". # Forms we handle: -# stage3-xxx-2018.0.tar.bz2 -# stage3-xxx-20180116.tar.bz2 -# stage3-xxx-20180116T015819Z.tar.bz2 +# stage3-xxx-2018.0.tar.xz +# stage3-xxx-20180116.tar.xz +# stage3-xxx-20180116T015819Z.tar.xz convert_filename() { sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g' } @@ -36,7 +36,7 @@ update_symlinks() { local d f 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 + for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) ln -sf "${f}" "${of}" done @@ -60,7 +60,7 @@ post_build() { upload netboot2-s390-${TIMESTAMP}/netboot* ;; stage3.spec) - upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2* + upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* ;; esac diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 2f9b9b4a..e56b4c81 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -24,9 +24,9 @@ give_latest_from_dates() { # Replace the date/time stamp in the filename to "latest". # Forms we handle: -# stage3-xxx-2018.0.tar.bz2 -# stage3-xxx-20180116.tar.bz2 -# stage3-xxx-20180116T015819Z.tar.bz2 +# stage3-xxx-2018.0.tar.xz +# stage3-xxx-20180116.tar.xz +# stage3-xxx-20180116T015819Z.tar.xz convert_filename() { sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g' } @@ -36,7 +36,7 @@ update_symlinks() { local d f 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 + for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) ln -sf "${f}" "${of}" done @@ -60,7 +60,7 @@ post_build() { upload netboot2-s390x-${TIMESTAMP}/netboot* ;; stage3.spec) - upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2* + upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* ;; esac