From 970421b7643f0aa97332980b89ae2a4ea7be28dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 19 Nov 2022 14:58:38 +0100 Subject: [PATCH] Add s390* systemd merged-usr build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs/s390/s390/stage1-systemd-mu.spec | 12 ++++++++++++ releases/specs/s390/s390/stage3-systemd-mu.spec | 10 ++++++++++ releases/specs/s390/s390x/stage1-systemd-mu.spec | 12 ++++++++++++ releases/specs/s390/s390x/stage3-systemd-mu.spec | 10 ++++++++++ tools/catalyst-auto-s390.conf | 7 ++++++- tools/catalyst-auto-s390x.conf | 7 ++++++- 6 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 releases/specs/s390/s390/stage1-systemd-mu.spec create mode 100644 releases/specs/s390/s390/stage3-systemd-mu.spec create mode 100644 releases/specs/s390/s390x/stage1-systemd-mu.spec create mode 100644 releases/specs/s390/s390x/stage3-systemd-mu.spec diff --git a/releases/specs/s390/s390/stage1-systemd-mu.spec b/releases/specs/s390/s390/stage1-systemd-mu.spec new file mode 100644 index 00000000..0b62a1bd --- /dev/null +++ b/releases/specs/s390/s390/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: s390 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/s390/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-s390-systemd-mergedusr-latest +update_seed: no +update_seed_command: --update --deep --newuse @world +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +pkgcache_path: /var/tmp/catalyst/packages/default/stage1-s390 diff --git a/releases/specs/s390/s390/stage3-systemd-mu.spec b/releases/specs/s390/s390/stage3-systemd-mu.spec new file mode 100644 index 00000000..db66c07c --- /dev/null +++ b/releases/specs/s390/s390/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: s390 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/s390/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-s390-systemd-mergedusr-@TIMESTAMP@ +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390 diff --git a/releases/specs/s390/s390x/stage1-systemd-mu.spec b/releases/specs/s390/s390x/stage1-systemd-mu.spec new file mode 100644 index 00000000..b989e248 --- /dev/null +++ b/releases/specs/s390/s390x/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: s390x +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/s390/17.0/s390x/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-s390x-systemd-mergedusr-latest +update_seed: no +update_seed_command: --update --deep --newuse @world +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +pkgcache_path: /var/tmp/catalyst/packages/default/stage1-s390x diff --git a/releases/specs/s390/s390x/stage3-systemd-mu.spec b/releases/specs/s390/s390x/stage3-systemd-mu.spec new file mode 100644 index 00000000..a89557b4 --- /dev/null +++ b/releases/specs/s390/s390x/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: s390x +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/s390/17.0/s390x/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-s390x-systemd-mergedusr-@TIMESTAMP@ +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 13810624..21336ad8 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -6,13 +6,15 @@ UPLOAD_KEY=/root/.ssh/id_rsa SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390 SUBARCH=s390 -SETS="openrc systemd" +SETS="openrc systemd systemd_mu" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec" SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" +SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" + KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390 update_symlinks() { @@ -45,6 +47,9 @@ post_build() { stage3-systemd.spec) upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz* ;; + stage3-systemd-mu.spec) + upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz* + ;; *) echo "Finished ${spec}" ;; diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index a49156a5..62042a7b 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -6,13 +6,15 @@ UPLOAD_KEY=/root/.ssh/id_rsa SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x SUBARCH=s390x -SETS="openrc systemd" +SETS="openrc systemd systemd_mu" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec" SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" +SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" + KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390 update_symlinks() { @@ -45,6 +47,9 @@ post_build() { stage3-systemd.spec) upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz* ;; + stage3-systemd-mu.spec) + upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz* + ;; *) echo "Finished ${spec}" ;;