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

Move s390 merged-usr builds to separate build types

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2022-11-24 18:53:55 +01:00
parent 1810d7e21b
commit 70c5609b66
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/specs/s390/s390/stage1-systemd-mu.spec
View file

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

4
releases/specs/s390/s390/stage3-systemd-mu.spec
View file

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

4
releases/specs/s390/s390x/stage1-systemd-mu.spec
View file

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

4
releases/specs/s390/s390x/stage3-systemd-mu.spec
View file

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

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

@ -20,7 +20,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
@ -35,7 +35,6 @@ post_build() {
local set=$1 spec=$2
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
netboot/netboot.spec)
mv netboot2-s390-${TIMESTAMP}/kernels/netboot netboot2-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
@ -48,13 +47,14 @@ post_build() {
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
stage3-systemd-mu.spec)
upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
*)
echo "Finished ${spec}"
;;
esac
popd >/dev/null
}

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

@ -20,7 +20,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
@ -35,7 +35,6 @@ post_build() {
local set=$1 spec=$2
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
netboot/netboot.spec)
mv netboot2-s390x-${TIMESTAMP}/kernels/netboot64 netboot2-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
@ -48,13 +47,14 @@ post_build() {
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
stage3-systemd-mu.spec)
upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
*)
echo "Finished ${spec}"
;;
esac
popd >/dev/null
}