From b9be3b7bbb0be9b69ddaf1dd2d68dc53a7dd8ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 23 Apr 2022 18:15:34 +0200 Subject: [PATCH] hppa: cleanups, modernization, build order 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/hppa2.0/stage1-openrc.spec | 4 +++- releases/specs/hppa/hppa2.0/stage1-systemd.spec | 4 +++- releases/specs/hppa/hppa2.0/stage3-openrc.spec | 3 ++- releases/specs/hppa/hppa2.0/stage3-systemd.spec | 3 ++- tools/catalyst-auto-hppa.conf | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/releases/specs/hppa/hppa2.0/stage1-openrc.spec b/releases/specs/hppa/hppa2.0/stage1-openrc.spec index da47be10..c6719ec0 100644 --- a/releases/specs/hppa/hppa2.0/stage1-openrc.spec +++ b/releases/specs/hppa/hppa2.0/stage1-openrc.spec @@ -8,4 +8,6 @@ source_subpath: default/stage3-hppa2.0-openrc-latest update_seed: yes portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa2.0 +compression_mode: pixz +decompressor_search_order: xz bzip2 +update_seed_command: --update --deep --newuse @world diff --git a/releases/specs/hppa/hppa2.0/stage1-systemd.spec b/releases/specs/hppa/hppa2.0/stage1-systemd.spec index c4bf7f45..8c398ffa 100644 --- a/releases/specs/hppa/hppa2.0/stage1-systemd.spec +++ b/releases/specs/hppa/hppa2.0/stage1-systemd.spec @@ -8,4 +8,6 @@ source_subpath: default/stage3-hppa2.0-systemd-latest update_seed: yes portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa2.0 +compression_mode: pixz +decompressor_search_order: xz bzip2 +update_seed_command: --update --deep --newuse @world diff --git a/releases/specs/hppa/hppa2.0/stage3-openrc.spec b/releases/specs/hppa/hppa2.0/stage3-openrc.spec index caffba0c..7fe51a39 100644 --- a/releases/specs/hppa/hppa2.0/stage3-openrc.spec +++ b/releases/specs/hppa/hppa2.0/stage3-openrc.spec @@ -7,4 +7,5 @@ snapshot: @TIMESTAMP@ source_subpath: default/stage1-hppa2.0-openrc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa2.0 +compression_mode: pixz +decompressor_search_order: xz bzip2 diff --git a/releases/specs/hppa/hppa2.0/stage3-systemd.spec b/releases/specs/hppa/hppa2.0/stage3-systemd.spec index 6d716ca2..7967b703 100644 --- a/releases/specs/hppa/hppa2.0/stage3-systemd.spec +++ b/releases/specs/hppa/hppa2.0/stage3-systemd.spec @@ -7,4 +7,5 @@ snapshot: @TIMESTAMP@ source_subpath: default/stage1-hppa2.0-systemd-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa2.0 +compression_mode: pixz +decompressor_search_order: xz bzip2 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index 09d1cfdd..935b8a48 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -5,7 +5,7 @@ UPLOAD_USER=hppa UPLOAD_KEY=/root/.ssh/id_ed25519 SPECS_DIR=${REPO_DIR}/releases/specs/hppa -SETS="hppa11_openrc hppa11_systemd hppa20_openrc hppa20_systemd hppa_livecd hppa_netboot" +SETS="hppa20_systemd hppa11_systemd hppa11_openrc hppa20_openrc hppa_livecd hppa_netboot" SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec" SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec"