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

[Andreas K. Hüttel]

commit:     cf7151f6a98d3f27c702513881cf3415a40cdad3
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 20:03:36 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 20:03:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=cf7151f6

amd64: move nomultilib builds to demeter

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

 .../stage1-openrc.spec}                                      |  4 ++--
 .../stage2-openrc.spec}                                      |  4 ++--
 .../stage3-openrc.spec}                                      |  4 ++--
 tools/catalyst-auto-amd64-demeter.conf                       |  8 ++++++++
 tools/catalyst-auto-amd64.conf                               | 12 ------------
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/releases/specs/amd64/stage1-nomultilib.spec b/releases/specs/amd64/nomultilib/stage1-openrc.spec
similarity index 72%
rename from releases/specs/amd64/stage1-nomultilib.spec
rename to releases/specs/amd64/nomultilib/stage1-openrc.spec
index f0a997b3..0d5530c9 100644
--- a/releases/specs/amd64/stage1-nomultilib.spec
+++ b/releases/specs/amd64/nomultilib/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: amd64
 target: stage1
-version_stamp: nomultilib-@TIMESTAMP@
+version_stamp: nomultilib-openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/amd64/17.1/no-multilib
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-amd64-nomultilib-latest
+source_subpath: default/stage3-amd64-nomultilib-openrc-latest
 compression_mode: pixz_x
 update_seed: yes
 update_seed_command: --update --deep --newuse @world

diff --git a/releases/specs/amd64/stage2-nomultilib.spec b/releases/specs/amd64/nomultilib/stage2-openrc.spec
similarity index 65%
rename from releases/specs/amd64/stage2-nomultilib.spec
rename to releases/specs/amd64/nomultilib/stage2-openrc.spec
index 39bc1cb6..da9e32a6 100644
--- a/releases/specs/amd64/stage2-nomultilib.spec
+++ b/releases/specs/amd64/nomultilib/stage2-openrc.spec
@@ -1,10 +1,10 @@
 subarch: amd64
 target: stage2
-version_stamp: nomultilib-@TIMESTAMP@
+version_stamp: nomultilib-openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/amd64/17.1/no-multilib
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-amd64-nomultilib-@TIMESTAMP@
+source_subpath: default/stage1-amd64-nomultilib-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/specs/amd64/stage3-nomultilib.spec b/releases/specs/amd64/nomultilib/stage3-openrc.spec
similarity index 65%
rename from releases/specs/amd64/stage3-nomultilib.spec
rename to releases/specs/amd64/nomultilib/stage3-openrc.spec
index 3beceaa8..dc28fef8 100644
--- a/releases/specs/amd64/stage3-nomultilib.spec
+++ b/releases/specs/amd64/nomultilib/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: amd64
 target: stage3
-version_stamp: nomultilib-@TIMESTAMP@
+version_stamp: nomultilib-openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/amd64/17.1/no-multilib
 snapshot: @TIMESTAMP@
-source_subpath: default/stage2-amd64-nomultilib-@TIMESTAMP@
+source_subpath: default/stage2-amd64-nomultilib-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf
index ec8a2ae3..f540af26 100644
--- a/tools/catalyst-auto-amd64-demeter.conf
+++ b/tools/catalyst-auto-amd64-demeter.conf
@@ -11,11 +11,16 @@ TYPE="auto"
 SPECS_DIR=${REPO_DIR}/releases/specs/amd64
 
 SETS="
+	nomultilib_openrc
 	musl
 	musl_hardened
 	x32_openrc
 "
 
+SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-openrc.spec nomultilib/stage3-openrc.spec"
+
+##SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
+
 SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
 SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec"
 
@@ -54,6 +59,9 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
 	case ${spec} in
+	nomultilib/stage3-openrc.spec)
+		upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+		;;
 	x32/stage3-openrc.spec)
 		upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
 		;;

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a6f1866c..b18efeba 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -13,7 +13,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
 
 SETS="
 	multilib minimal_multilib
-	nomultilib minimal_nomultilib
 	systemd
 	hardened_multilib minimal_hardened_multilib
 	hardened_nomultilib minimal_hardened_nomultilib
@@ -23,8 +22,6 @@ SETS="
 SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
 SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 #SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
-SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-#SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
 
 SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
 
@@ -79,18 +76,9 @@ post_build() {
 	stage4-minimal.spec)
 		upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
 		;;
-	stage3-nomultilib.spec)
-		upload stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz*
-		;;
-	stage4-nomultilib-minimal.spec)
-		upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
-		;;
 	stage3-systemd.spec)
 		upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
 		;;
-	stage3-x32.spec)
-		upload stage3-x32-${TIMESTAMP}.tar.xz*
-		;;
 	esac
 	popd >/dev/null || exit