| 1 |
commit: 0d88b842623fae95f7ac6e1111e566d8650a6319 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 30 21:04:14 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 30 21:10:25 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0d88b842 |
| 7 |
|
| 8 |
catalyst-auto: Use xz instead of bz2 for s390 builds |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
tools/catalyst-auto-s390.conf | 10 +++++----- |
| 13 |
tools/catalyst-auto-s390x.conf | 10 +++++----- |
| 14 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf |
| 17 |
index b42797dc..30d78e76 100644 |
| 18 |
--- a/tools/catalyst-auto-s390.conf |
| 19 |
+++ b/tools/catalyst-auto-s390.conf |
| 20 |
@@ -24,9 +24,9 @@ give_latest_from_dates() { |
| 21 |
|
| 22 |
# Replace the date/time stamp in the filename to "latest". |
| 23 |
# Forms we handle: |
| 24 |
-# stage3-xxx-2018.0.tar.bz2 |
| 25 |
-# stage3-xxx-20180116.tar.bz2 |
| 26 |
-# stage3-xxx-20180116T015819Z.tar.bz2 |
| 27 |
+# stage3-xxx-2018.0.tar.xz |
| 28 |
+# stage3-xxx-20180116.tar.xz |
| 29 |
+# stage3-xxx-20180116T015819Z.tar.xz |
| 30 |
convert_filename() { |
| 31 |
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g' |
| 32 |
} |
| 33 |
@@ -36,7 +36,7 @@ update_symlinks() { |
| 34 |
local d f |
| 35 |
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do |
| 36 |
pushd "${d}" >/dev/null |
| 37 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do |
| 38 |
+ for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do |
| 39 |
local of=$(echo "${f}" | convert_filename) |
| 40 |
ln -sf "${f}" "${of}" |
| 41 |
done |
| 42 |
@@ -60,7 +60,7 @@ post_build() { |
| 43 |
upload netboot2-s390-${TIMESTAMP}/netboot* |
| 44 |
;; |
| 45 |
stage3.spec) |
| 46 |
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2* |
| 47 |
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* |
| 48 |
;; |
| 49 |
esac |
| 50 |
|
| 51 |
|
| 52 |
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf |
| 53 |
index 2f9b9b4a..e56b4c81 100644 |
| 54 |
--- a/tools/catalyst-auto-s390x.conf |
| 55 |
+++ b/tools/catalyst-auto-s390x.conf |
| 56 |
@@ -24,9 +24,9 @@ give_latest_from_dates() { |
| 57 |
|
| 58 |
# Replace the date/time stamp in the filename to "latest". |
| 59 |
# Forms we handle: |
| 60 |
-# stage3-xxx-2018.0.tar.bz2 |
| 61 |
-# stage3-xxx-20180116.tar.bz2 |
| 62 |
-# stage3-xxx-20180116T015819Z.tar.bz2 |
| 63 |
+# stage3-xxx-2018.0.tar.xz |
| 64 |
+# stage3-xxx-20180116.tar.xz |
| 65 |
+# stage3-xxx-20180116T015819Z.tar.xz |
| 66 |
convert_filename() { |
| 67 |
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g' |
| 68 |
} |
| 69 |
@@ -36,7 +36,7 @@ update_symlinks() { |
| 70 |
local d f |
| 71 |
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do |
| 72 |
pushd "${d}" >/dev/null |
| 73 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do |
| 74 |
+ for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do |
| 75 |
local of=$(echo "${f}" | convert_filename) |
| 76 |
ln -sf "${f}" "${of}" |
| 77 |
done |
| 78 |
@@ -60,7 +60,7 @@ post_build() { |
| 79 |
upload netboot2-s390x-${TIMESTAMP}/netboot* |
| 80 |
;; |
| 81 |
stage3.spec) |
| 82 |
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2* |
| 83 |
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* |
| 84 |
;; |
| 85 |
esac |
Archives