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

s390: update stage file and spec file names (openrc)

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2022-05-22 23:39:10 +02:00
parent 09f346a4d3
commit 3e184dc0f7
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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-s390-@TIMESTAMP@
source_subpath: default/stage3-s390-openrc-@TIMESTAMP@
pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-s390
# these shouldn't change

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

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

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

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

11
tools/catalyst-auto-s390.conf
View file

@ -6,11 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default netboot"
SETS="openrc"
SET_default_SPECS="stage1.spec stage3.spec"
SET_netboot_SPECS="netboot/netboot.spec"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@ -38,8 +37,8 @@ post_build() {
mv netboot2-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot2-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
upload netboot2-s390-${TIMESTAMP}/netboot*
;;
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
;;
*)
echo "Finished ${spec}"