[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/s390/s390/

2024-01-28 Thread Andreas K. Hüttel
commit: 6965de36ee06bcaecace0233c44a2afcfd08c534
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Mon Jan 29 03:18:42 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Mon Jan 29 03:18:42 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=6965de36

Enable s390 23.0 32bit builds

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 releases/specs/s390/s390/stage1-openrc-23.spec  | 11 +++
 releases/specs/s390/s390/stage1-systemd-23.spec | 11 +++
 releases/specs/s390/s390/stage3-openrc-23.spec  | 10 ++
 releases/specs/s390/s390/stage3-systemd-23.spec | 10 ++
 tools/catalyst-auto-s390.conf   | 20 +++-
 5 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/releases/specs/s390/s390/stage1-openrc-23.spec 
b/releases/specs/s390/s390/stage1-openrc-23.spec
new file mode 100644
index ..b9f1e91d
--- /dev/null
+++ b/releases/specs/s390/s390/stage1-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: s390
+version_stamp: openrc-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390-openrc-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/specs/s390/s390/stage1-systemd-23.spec 
b/releases/specs/s390/s390/stage1-systemd-23.spec
new file mode 100644
index ..bf316dee
--- /dev/null
+++ b/releases/specs/s390/s390/stage1-systemd-23.spec
@@ -0,0 +1,11 @@
+subarch: s390
+version_stamp: systemd-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390-systemd-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/specs/s390/s390/stage3-openrc-23.spec 
b/releases/specs/s390/s390/stage3-openrc-23.spec
new file mode 100644
index ..d075c81c
--- /dev/null
+++ b/releases/specs/s390/s390/stage3-openrc-23.spec
@@ -0,0 +1,10 @@
+subarch: s390
+version_stamp: openrc-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390

diff --git a/releases/specs/s390/s390/stage3-systemd-23.spec 
b/releases/specs/s390/s390/stage3-systemd-23.spec
new file mode 100644
index ..f7489afa
--- /dev/null
+++ b/releases/specs/s390/s390/stage3-systemd-23.spec
@@ -0,0 +1,10 @@
+subarch: s390
+version_stamp: systemd-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index a9cbf249..5c5884d7 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -6,13 +6,23 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
 SUBARCH=s390
 
-SETS="openrc systemd_mu"
+SETS="
+   openrc
+   systemd_mu
+   openrc_23
+   systemd_23
+"
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
 
 SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
 
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
+
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
 update_symlinks() {
@@ -54,4 +64,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+   pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+   case ${spec} in
+   stage3-systemd-23.spec)
+   upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
+   ;;
+   esac
+   popd >/dev/null
 }



[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/s390/s390/

2022-05-22 Thread Andreas K. Hüttel
commit: f8cae81a43e2941377df839c70171b722f0cd902
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun May 22 21:42:58 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun May 22 21:42:58 2022 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f8cae81a

s390: Add systemd stage builds

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 releases/specs/s390/s390/stage1-systemd.spec | 12 
 releases/specs/s390/s390/stage3-systemd.spec | 10 ++
 tools/catalyst-auto-s390.conf|  7 ++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/releases/specs/s390/s390/stage1-systemd.spec 
b/releases/specs/s390/s390/stage1-systemd.spec
new file mode 100644
index ..655c5185
--- /dev/null
+++ b/releases/specs/s390/s390/stage1-systemd.spec
@@ -0,0 +1,12 @@
+subarch: s390
+version_stamp: systemd-@TIMESTAMP@
+target: stage1
+rel_type: default
+profile: default/linux/s390/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-s390-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-s390

diff --git a/releases/specs/s390/s390/stage3-systemd.spec 
b/releases/specs/s390/s390/stage3-systemd.spec
new file mode 100644
index ..6f786d4c
--- /dev/null
+++ b/releases/specs/s390/s390/stage3-systemd.spec
@@ -0,0 +1,10 @@
+subarch: s390
+version_stamp: systemd-@TIMESTAMP@
+target: stage3
+rel_type: default
+profile: default/linux/s390/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-s390-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 8722de98..42d49baa 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -6,11 +6,13 @@ 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="openrc"
+SETS="openrc systemd"
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
 
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
+
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
 update_symlinks() {
@@ -40,6 +42,9 @@ post_build() {
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
;;
+   stage3-systemd.spec)
+   upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
+   ;;
*)
echo "Finished ${spec}"
;;