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

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

[Andreas K. Hüttel]

commit:     cf123d31a6ddf5a3570095cf0103517a6667a577
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 21:24:23 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 21:24:23 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=cf123d31

Switch sparc boot media to 23.0

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

 releases/specs/sparc/sparc64/installcd-stage1.spec |  6 +--
 .../sparc/sparc64/installcd-stage2-minimal.spec    | 50 +++++++++++-----------
 tools/catalyst-auto-sparc64.conf                   |  8 ++--
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/releases/specs/sparc/sparc64/installcd-stage1.spec b/releases/specs/sparc/sparc64/installcd-stage1.spec
index 07591873..00c7a9ee 100644
--- a/releases/specs/sparc/sparc64/installcd-stage1.spec
+++ b/releases/specs/sparc/sparc64/installcd-stage1.spec
@@ -1,10 +1,10 @@
 subarch: sparc64
 version_stamp: @TIMESTAMP@
 target: livecd-stage1
-rel_type: default
-profile: default/linux/sparc/17.0/64ul
+rel_type: 23.0-default
+profile: default/linux/sparc/23.0/64ul
 snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-sparc64-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-sparc64-openrc-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/isos
 

diff --git a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
index ad71d265..dcaf63dd 100644
--- a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
+++ b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
 subarch: sparc64
 version_stamp: @TIMESTAMP@
 target: livecd-stage2
-rel_type: default
-profile: default/linux/sparc/17.0/64ul
+rel_type: 23.0-default
+profile: default/linux/sparc/23.0/64ul
 snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-sparc64-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-sparc64-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
@@ -75,10 +75,10 @@ livecd/empty:
 	/etc/rsync
 	/etc/runlevels/single
 	/etc/skel
-	/lib/dev-state
-	/lib/udev-state
-	/lib64/dev-state
-	/lib64/udev-state
+	/usr/lib/dev-state
+	/usr/lib/udev-state
+	/usr/lib64/dev-state
+	/usr/lib64/udev-state
 	/root/.ccache
 	/tmp
 	/usr/diet/include
@@ -165,17 +165,17 @@ livecd/rm:
 	/etc/make.profile
 	/etc/man.conf
 	/etc/resolv.conf
-	/lib*/*.a
-	/lib*/*.la
-	/lib*/cpp
+	/usr/lib*/*.a
+	/usr/lib*/*.la
+	/usr/lib*/cpp
 	/root/.bash_history
 	/root/.viminfo
-	/sbin/*.static
-	/sbin/fsck.cramfs
-	/sbin/fsck.minix
-	/sbin/mkfs.bfs
-	/sbin/mkfs.cramfs
-	/sbin/mkfs.minix
+	/usr/bin/*.static
+	/usr/bin/fsck.cramfs
+	/usr/bin/fsck.minix
+	/usr/bin/mkfs.bfs
+	/usr/bin/mkfs.cramfs
+	/usr/bin/mkfs.minix
 	/usr/bin/addr2line
 	/usr/bin/ar
 	/usr/bin/as
@@ -221,15 +221,15 @@ livecd/rm:
 	/usr/lib*/*.la
 	/usr/lib*/perl5/site_perl
 	/usr/lib*/gcc-lib/*/*/libgcj*
-	/usr/sbin/archive-conf
-	/usr/sbin/dispatch-conf
-	/usr/sbin/emaint
-	/usr/sbin/env-update
-	/usr/sbin/etc-update
-	/usr/sbin/fb*
-	/usr/sbin/fixpackages
-	/usr/sbin/quickpkg
-	/usr/sbin/regenworld
+	/usr/bin/archive-conf
+	/usr/bin/dispatch-conf
+	/usr/bin/emaint
+	/usr/bin/env-update
+	/usr/bin/etc-update
+	/usr/bin/fb*
+	/usr/bin/fixpackages
+	/usr/bin/quickpkg
+	/usr/bin/regenworld
 	/usr/share/consolefonts/1*
 	/usr/share/consolefonts/7*
 	/usr/share/consolefonts/8*

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index d094f457..3f797369 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -17,12 +17,12 @@ SETS="
 SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
 
 SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
-SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
 
 SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec sparc/stage3-openrc-23.spec"
 SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec sparc/stage3-systemd-23.spec"
 
 SET_openrc_64_23_SPECS="sparc64/stage1-openrc-23.spec sparc64/stage3-openrc-23.spec"
+SET_openrc_64_23_OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
 SET_systemd_64_23_SPECS="sparc64/stage1-systemd-23.spec sparc64/stage3-systemd-23.spec"
 
 
@@ -53,9 +53,6 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
 	case ${spec} in
-	sparc64/installcd-stage2-minimal.spec)
-		upload *${TIMESTAMP}*.iso*
-		;;
 	sparc/stage3.spec)
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
 		;;
@@ -81,6 +78,9 @@ post_build() {
 		upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64
 		;;
+	sparc64/installcd-stage2-minimal.spec)
+		upload *${TIMESTAMP}*.iso*
+		;;
 	esac
 	popd >/dev/null
 }