commit: 70c5609b668da0f6aa5e244968baa2e3e73aa3db
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 17:53:55 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 17:53:55 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=70c5609b
Move s390 merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/s390/s390/stage1-systemd-mu.spec | 4 ++--
releases/specs/s390/s390/stage3-systemd-mu.spec | 4 ++--
releases/specs/s390/s390x/stage1-systemd-mu.spec | 4 ++--
releases/specs/s390/s390x/stage3-systemd-mu.spec | 4 ++--
tools/catalyst-auto-s390.conf | 12 ++++++------
tools/catalyst-auto-s390x.conf | 12 ++++++------
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/releases/specs/s390/s390/stage1-systemd-mu.spec
b/releases/specs/s390/s390/stage1-systemd-mu.spec
index 0b62a1bd..4cf06efc 100644
--- a/releases/specs/s390/s390/stage1-systemd-mu.spec
+++ b/releases/specs/s390/s390/stage1-systemd-mu.spec
@@ -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
diff --git a/releases/specs/s390/s390/stage3-systemd-mu.spec
b/releases/specs/s390/s390/stage3-systemd-mu.spec
index db66c07c..8ed63c47 100644
--- a/releases/specs/s390/s390/stage3-systemd-mu.spec
+++ b/releases/specs/s390/s390/stage3-systemd-mu.spec
@@ -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
diff --git a/releases/specs/s390/s390x/stage1-systemd-mu.spec
b/releases/specs/s390/s390x/stage1-systemd-mu.spec
index b989e248..388471ea 100644
--- a/releases/specs/s390/s390x/stage1-systemd-mu.spec
+++ b/releases/specs/s390/s390x/stage1-systemd-mu.spec
@@ -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
diff --git a/releases/specs/s390/s390x/stage3-systemd-mu.spec
b/releases/specs/s390/s390x/stage3-systemd-mu.spec
index a89557b4..ae4fcb7f 100644
--- a/releases/specs/s390/s390x/stage3-systemd-mu.spec
+++ b/releases/specs/s390/s390x/stage3-systemd-mu.spec
@@ -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
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 96417029..2b9a505b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -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
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index b7ba5663..0c3b6f10 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -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
}
