chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s390x: enable systemd stages

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2022-05-25 13:35:08 +02:00
parent a624a66b9d
commit 6f46d57fa4
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
6 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
releases/specs/s390/s390x/netboot/netboot.spec
View file

@ -1,7 +1,7 @@
# S390 Netboot spec file, based in HPPA Netboot spec file by Guy Martin # S390 Netboot spec file, based in HPPA Netboot spec file by Guy Martin
version_stamp: @TIMESTAMP@ version_stamp: @TIMESTAMP@
snapshot: @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 pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-s390x
# these shouldn't change # these shouldn't change

4
releases/specs/s390/s390x/stage1.spec → releases/specs/s390/s390x/stage1-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: s390x subarch: s390x
version_stamp: @TIMESTAMP@ version_stamp: @TIMESTAMP@-openrc
target: stage1 target: stage1
rel_type: default rel_type: default
profile: default/linux/s390/17.0/s390x profile: default/linux/s390/17.0/s390x
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-s390x-latest source_subpath: default/stage3-s390x-openrc-latest
update_seed: yes update_seed: yes
update_seed_command: --update --deep --newuse @world update_seed_command: --update --deep --newuse @world
compression_mode: pixz compression_mode: pixz

12
releases/specs/s390/s390x/stage1-systemd.spec Normal file
View file

@ -0,0 +1,12 @@
subarch: s390x
version_stamp: @TIMESTAMP@-systemd
target: stage1
rel_type: default
profile: default/linux/s390/17.0/s390x/systemd
snapshot: @TIMESTAMP@
source_subpath: default/stage3-s390x-systemd-latest
update_seed: yes
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

4
releases/specs/s390/s390x/stage3.spec → releases/specs/s390/s390x/stage3-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: s390x subarch: s390x
version_stamp: @TIMESTAMP@ version_stamp: @TIMESTAMP@-openrc
target: stage3 target: stage3
rel_type: default rel_type: default
profile: default/linux/s390/17.0/s390x profile: default/linux/s390/17.0/s390x
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage1-s390x-@TIMESTAMP@ source_subpath: default/stage1-s390x-openrc-@TIMESTAMP@
compression_mode: pixz compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages portage_confdir: @REPO_DIR@/releases/portage/stages
pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x

10
releases/specs/s390/s390x/stage3-systemd.spec Normal file
View file

@ -0,0 +1,10 @@
subarch: s390x
version_stamp: @TIMESTAMP@-systemd
target: stage3
rel_type: default
profile: default/linux/s390/17.0/s390x/systemd
snapshot: @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

16
tools/catalyst-auto-s390x.conf
View file

@ -4,13 +4,14 @@
UPLOAD_USER=s390 UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x 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 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} mv netboot2-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot2-s390x-${TIMESTAMP}/netboot* upload netboot2-s390x-${TIMESTAMP}/netboot*
;; ;;
stage3.spec) stage3-openrc.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
;; ;;
*) *)
echo "Finished ${spec}" echo "Finished ${spec}"