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

[Andreas K. Hüttel]

commit:     16e795ced432de39f65f173a2fe41d08f20d8743
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  2 19:10:07 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul  2 19:35:06 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=16e795ce

x86: copy catalyst-auto config for demeter, move i486 there only so far

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

 .../installcd-stage1-openrc.spec}                  |  4 +-
 .../installcd-stage2-minimal-openrc.spec}          |  6 +--
 .../x86/{stage1.spec => i486/stage1-openrc.spec}   |  4 +-
 .../x86/{stage2.spec => i486/stage2-openrc.spec}   |  4 +-
 .../x86/{stage3.spec => i486/stage3-openrc.spec}   |  4 +-
 tools/catalyst-auto-x86-demeter.conf               | 63 ++++++++++++++++++++++
 tools/catalyst-auto-x86.conf                       |  4 --
 7 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/releases/specs/x86/installcd-stage1.spec b/releases/specs/x86/i486/installcd-stage1-openrc.spec
similarity index 95%
rename from releases/specs/x86/installcd-stage1.spec
rename to releases/specs/x86/i486/installcd-stage1-openrc.spec
index 7dd5ac62..518820c6 100644
--- a/releases/specs/x86/installcd-stage1.spec
+++ b/releases/specs/x86/i486/installcd-stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: i486
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 target: livecd-stage1
 rel_type: default
 profile: default/linux/x86/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-i486-@TIMESTAMP@
+source_subpath: default/stage3-i486-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/isos
 

diff --git a/releases/specs/x86/installcd-stage2-minimal.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
similarity index 96%
rename from releases/specs/x86/installcd-stage2-minimal.spec
rename to releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
index 8702a9d5..0b0d878c 100644
--- a/releases/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
@@ -1,16 +1,16 @@
 subarch: i486
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 target: livecd-stage2
 rel_type: default
 profile: default/linux/x86/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/livecd-stage1-i486-@TIMESTAMP@
+source_subpath: default/livecd-stage1-i486-openrc-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 #livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
-livecd/iso: install-x86-minimal-@TIMESTAMP@.iso
+livecd/iso: install-x86-minimal-openrc-@TIMESTAMP@.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo x86 @TIMESTAMP@
 

diff --git a/releases/specs/x86/stage1.spec b/releases/specs/x86/i486/stage1-openrc.spec
similarity index 76%
rename from releases/specs/x86/stage1.spec
rename to releases/specs/x86/i486/stage1-openrc.spec
index 598b5e94..32ba9397 100644
--- a/releases/specs/x86/stage1.spec
+++ b/releases/specs/x86/i486/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: i486
 target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/x86/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-i486-latest
+source_subpath: default/stage3-i486-openrc-latest
 compression_mode: pixz_x
 update_seed: yes
 update_seed_command: --update --deep --newuse @world

diff --git a/releases/specs/x86/stage2.spec b/releases/specs/x86/i486/stage2-openrc.spec
similarity index 69%
rename from releases/specs/x86/stage2.spec
rename to releases/specs/x86/i486/stage2-openrc.spec
index db2433fe..76285e2c 100644
--- a/releases/specs/x86/stage2.spec
+++ b/releases/specs/x86/i486/stage2-openrc.spec
@@ -1,10 +1,10 @@
 subarch: i486
 target: stage2
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/x86/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i486-@TIMESTAMP@
+source_subpath: default/stage1-i486-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/specs/x86/stage3.spec b/releases/specs/x86/i486/stage3-openrc.spec
similarity index 69%
rename from releases/specs/x86/stage3.spec
rename to releases/specs/x86/i486/stage3-openrc.spec
index b9e685f9..30db8c5f 100644
--- a/releases/specs/x86/stage3.spec
+++ b/releases/specs/x86/i486/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: i486
 target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/x86/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage2-i486-@TIMESTAMP@
+source_subpath: default/stage2-i486-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf
new file mode 100644
index 00000000..522ccc26
--- /dev/null
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -0,0 +1,63 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+UPLOAD_USER=x86
+UPLOAD_KEY=/root/.ssh/id_rsa
+host=$(hostname)
+
+ARCH="x86"
+TYPE="auto"
+
+SPECS_DIR=${REPO_DIR}/releases/specs/x86
+
+SETS="
+	i486_openrc
+"
+
+SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage2-openrc.spec i486/stage3-openrc.spec"
+SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec"
+
+
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
+
+EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
+
+update_symlinks() {
+	# Symlink the latest stages3 to build from
+	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+		pushd "${d}" >/dev/null || exit
+		shopt -s extglob
+		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
+			# 20yymmddThhmmssZ
+			# 20yymmddhhmmss
+			# 20yymmdd
+			# 20yy.n
+			of=$(perl -p \
+				-e 's/20\d{6}T\d{6}Z/latest/g;' \
+				-e 's/20\d{6}\d{6}/latest/g;' \
+				-e 's/20\d{6}/latest/g;' \
+				-e 's/20\d{2}\.\d{2}/latest/g;' \
+				<<<"$f")
+			ln -svf "$f" "$of"
+		done
+		popd >/dev/null || exit
+	done
+}
+
+post_build() {
+	local set=$1 spec=$2
+
+	pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+	case ${spec} in
+	i486/stage3-openrc.spec)
+		upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
+		;;
+	i486/installcd-stage2-minimal-openrc.spec)
+		upload install-x86-minimal-openrc-${TIMESTAMP}.iso*
+		;;
+	esac
+	popd >/dev/null || exit
+}
+
+# vim:ft=sh:

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index cee289e4..d63c14c8 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -12,15 +12,11 @@ source /etc/catalyst/release/build.env
 SPECS_DIR=${REPO_DIR}/releases/specs/x86
 
 SETS="
-	i486
 	i686
 	i686_systemd
 	hardened
 "
 
-SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
 SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
 
 SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"