catalyst-auto: Use xz instead of bz2 for s390 builds

Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner 2019-05-30 14:04:14 -07:00
parent c02b25b765
commit 0d88b84262
2 changed files with 10 additions and 10 deletions

View file

@ -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

View file

@ -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