From 6a556d1e1634308127788b3dfad2d466c6c1309e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 23 Apr 2022 01:34:17 +0200 Subject: [PATCH] hppa1.1: go xz and simplify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs/hppa/hppa1.1/stage1-openrc.spec | 3 ++- releases/specs/hppa/hppa1.1/stage1-systemd.spec | 3 ++- releases/specs/hppa/hppa1.1/stage3-openrc.spec | 3 ++- releases/specs/hppa/hppa1.1/stage3-systemd.spec | 3 ++- tools/catalyst-auto-hppa.conf | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/releases/specs/hppa/hppa1.1/stage1-openrc.spec b/releases/specs/hppa/hppa1.1/stage1-openrc.spec index d7fad4b7..cc16449a 100644 --- a/releases/specs/hppa/hppa1.1/stage1-openrc.spec +++ b/releases/specs/hppa/hppa1.1/stage1-openrc.spec @@ -8,4 +8,5 @@ source_subpath: default/stage3-hppa1.1-openrc-latest update_seed: yes portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa1.1 +compression_mode: pixz +decompressor_search_order: xz bzip2 diff --git a/releases/specs/hppa/hppa1.1/stage1-systemd.spec b/releases/specs/hppa/hppa1.1/stage1-systemd.spec index 36d8075b..8f0b0849 100644 --- a/releases/specs/hppa/hppa1.1/stage1-systemd.spec +++ b/releases/specs/hppa/hppa1.1/stage1-systemd.spec @@ -8,4 +8,5 @@ source_subpath: default/stage3-hppa1.1-systemd-latest update_seed: yes portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa1.1 +compression_mode: pixz +decompressor_search_order: xz bzip2 diff --git a/releases/specs/hppa/hppa1.1/stage3-openrc.spec b/releases/specs/hppa/hppa1.1/stage3-openrc.spec index 37bb63b2..0eaa1059 100644 --- a/releases/specs/hppa/hppa1.1/stage3-openrc.spec +++ b/releases/specs/hppa/hppa1.1/stage3-openrc.spec @@ -7,4 +7,5 @@ snapshot: @TIMESTAMP@ source_subpath: default/stage1-hppa1.1-openrc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa1.1 +compression_mode: pixz +decompressor_search_order: xz bzip2 diff --git a/releases/specs/hppa/hppa1.1/stage3-systemd.spec b/releases/specs/hppa/hppa1.1/stage3-systemd.spec index 5720d021..5760be36 100644 --- a/releases/specs/hppa/hppa1.1/stage3-systemd.spec +++ b/releases/specs/hppa/hppa1.1/stage3-systemd.spec @@ -7,4 +7,5 @@ snapshot: @TIMESTAMP@ source_subpath: default/stage1-hppa1.1-systemd-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa1.1 +compression_mode: pixz +decompressor_search_order: xz bzip2 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index 53b2f68b..09d1cfdd 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -27,7 +27,7 @@ update_symlinks() { for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do pushd "${d}" >/dev/null for t in hppa1.1 hppa2.0; do - for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do + for f in $(ls stage3-${t}-*bz2 stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) ln -sf "${f}" "${of}" done @@ -54,10 +54,10 @@ post_build() { upload install-hppa-minimal-*${TIMESTAMP}*.iso* ;; hppa1.1/stage3-openrc.spec) - upload stage3-hppa1.1-openrc-*${TIMESTAMP}*.bz2* + upload stage3-hppa1.1-openrc-*${TIMESTAMP}*.xz* ;; hppa1.1/stage3-systemd.spec) - upload stage3-hppa1.1-systemd-*${TIMESTAMP}*.bz2* + upload stage3-hppa1.1-systemd-*${TIMESTAMP}*.xz* ;; hppa2.0/stage3-openrc.spec) upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.bz2*