commit: 6f46d57fa41c2c3123c4fad01e88c7ee1a775e32
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 11:35:08 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed May 25 11:35:08 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6f46d57f
s390x: enable systemd stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/s390/s390x/netboot/netboot.spec | 2 +-
.../specs/s390/s390x/{stage1.spec => stage1-openrc.spec} | 4 ++--
.../s390/s390x/{stage1.spec => stage1-systemd.spec} | 6 +++---
.../specs/s390/s390x/{stage3.spec => stage3-openrc.spec} | 4 ++--
.../s390/s390x/{stage3.spec => stage3-systemd.spec} | 6 +++---
tools/catalyst-auto-s390x.conf | 16 ++++++++++------
6 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/releases/specs/s390/s390x/netboot/netboot.spec
b/releases/specs/s390/s390x/netboot/netboot.spec
index 45d26157..e3914b9d 100644
--- a/releases/specs/s390/s390x/netboot/netboot.spec
+++ b/releases/specs/s390/s390x/netboot/netboot.spec
@@ -1,7 +1,7 @@
# S390 Netboot spec file, based in HPPA Netboot spec file by Guy Martin
version_stamp: @TIMESTAMP@
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-s390x-@TIMESTAMP@
+source_subpath: default/stage3-s390x-openrc-@TIMESTAMP@
pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-s390x
# these shouldn't change
diff --git a/releases/specs/s390/s390x/stage1.spec
b/releases/specs/s390/s390x/stage1-openrc.spec
similarity index 78%
copy from releases/specs/s390/s390x/stage1.spec
copy to releases/specs/s390/s390x/stage1-openrc.spec
index c2410423..ffe05e35 100644
--- a/releases/specs/s390/s390x/stage1.spec
+++ b/releases/specs/s390/s390x/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: s390x
-version_stamp: @TIMESTAMP@
+version_stamp: @TIMESTAMP@-openrc
target: stage1
rel_type: default
profile: default/linux/s390/17.0/s390x
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-s390x-latest
+source_subpath: default/stage3-s390x-openrc-latest
update_seed: yes
update_seed_command: --update --deep --newuse @world
compression_mode: pixz
diff --git a/releases/specs/s390/s390x/stage1.spec
b/releases/specs/s390/s390x/stage1-systemd.spec
similarity index 67%
rename from releases/specs/s390/s390x/stage1.spec
rename to releases/specs/s390/s390x/stage1-systemd.spec
index c2410423..cbdf2e44 100644
--- a/releases/specs/s390/s390x/stage1.spec
+++ b/releases/specs/s390/s390x/stage1-systemd.spec
@@ -1,10 +1,10 @@
subarch: s390x
-version_stamp: @TIMESTAMP@
+version_stamp: @TIMESTAMP@-systemd
target: stage1
rel_type: default
-profile: default/linux/s390/17.0/s390x
+profile: default/linux/s390/17.0/s390x/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-s390x-latest
+source_subpath: default/stage3-s390x-systemd-latest
update_seed: yes
update_seed_command: --update --deep --newuse @world
compression_mode: pixz
diff --git a/releases/specs/s390/s390x/stage3.spec
b/releases/specs/s390/s390x/stage3-openrc.spec
similarity index 73%
copy from releases/specs/s390/s390x/stage3.spec
copy to releases/specs/s390/s390x/stage3-openrc.spec
index b545329b..4f742f46 100644
--- a/releases/specs/s390/s390x/stage3.spec
+++ b/releases/specs/s390/s390x/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: s390x
-version_stamp: @TIMESTAMP@
+version_stamp: @TIMESTAMP@-openrc
target: stage3
rel_type: default
profile: default/linux/s390/17.0/s390x
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-s390x-@TIMESTAMP@
+source_subpath: default/stage1-s390x-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x
diff --git a/releases/specs/s390/s390x/stage3.spec
b/releases/specs/s390/s390x/stage3-systemd.spec
similarity index 59%
rename from releases/specs/s390/s390x/stage3.spec
rename to releases/specs/s390/s390x/stage3-systemd.spec
index b545329b..c7fb7e81 100644
--- a/releases/specs/s390/s390x/stage3.spec
+++ b/releases/specs/s390/s390x/stage3-systemd.spec
@@ -1,10 +1,10 @@
subarch: s390x
-version_stamp: @TIMESTAMP@
+version_stamp: @TIMESTAMP@-systemd
target: stage3
rel_type: default
-profile: default/linux/s390/17.0/s390x
+profile: default/linux/s390/17.0/s390x/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-s390x-@TIMESTAMP@
+source_subpath: default/stage1-s390x-systemd-@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-s390x.conf b/tools/catalyst-auto-s390x.conf
index b29d352f..a49156a5 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -4,13 +4,14 @@
UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+SUBARCH=s390x
-SETS="default netboot"
+SETS="openrc systemd"
-SET_default_SPECS="stage1.spec stage3.spec"
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_netboot_SPECS="netboot/netboot.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@@ -38,8 +39,11 @@ post_build() {
mv netboot2-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz
netboot2-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot2-s390x-${TIMESTAMP}/netboot*
;;
- stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
+ stage3-openrc.spec)
+ upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-systemd.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
;;
*)
echo "Finished ${spec}"
