Convert alpha iso to 23.0

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

3 files changed, 33 insertions, 33 deletions

diff --git a/releases/specs-qemu/alpha/installcd-stage1.spec b/releases/specs-qemu/alpha/installcd-stage1.spec
index 6d7fa9be..c8300a93 100644
--- a/releases/specs-qemu/alpha/installcd-stage1.spec
+++ b/releases/specs-qemu/alpha/installcd-stage1.spec
@@ -1,10 +1,10 @@
 subarch: alpha
 version_stamp: @TIMESTAMP@
 target: livecd-stage1
-rel_type: default
-profile: default/linux/alpha/17.0
+rel_type: 23.0-default
+profile: default/linux/alpha/23.0
 snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-alpha-openrc-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-alpha-openrc-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/isos-qemu
 interpreter: /usr/bin/qemu-alpha
 compression_mode: pixz
diff --git a/releases/specs-qemu/alpha/installcd-stage2-minimal.spec b/releases/specs-qemu/alpha/installcd-stage2-minimal.spec
index f9cbde4d..e0437a95 100644
--- a/releases/specs-qemu/alpha/installcd-stage2-minimal.spec
+++ b/releases/specs-qemu/alpha/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
 subarch: alpha
 version_stamp: @TIMESTAMP@
 target: livecd-stage2
-rel_type: default
-profile: default/linux/alpha/17.0
+rel_type: 23.0-default
+profile: default/linux/alpha/23.0
 snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-alpha-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-alpha-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/isos-qemu
 interpreter: /usr/bin/qemu-alpha
 
@@ -12,7 +12,7 @@ livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/aboot-1.0_pre20040408-r2-cdtar.tar.bz2
 livecd/fsscript: /root/releng/releases/scripts/livecd.sh
 livecd/fstype: squashfs
-livecd/iso: /var/tmp/catalyst/builds/default/install-alpha-minimal-@TIMESTAMP@.iso
+livecd/iso: /var/tmp/catalyst/builds/23.0-default/install-alpha-minimal-@TIMESTAMP@.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo alpha @TIMESTAMP@
 livecd/gk_mainargs: --firmware-files=qlogic/1040.bin
@@ -105,10 +105,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
@@ -196,17 +196,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
@@ -255,15 +255,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-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 62a52805..d62670b1 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -13,9 +13,9 @@ SETS="
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
 SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
@@ -39,9 +39,6 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
 	case ${spec} in
-	installcd-stage2-minimal.spec)
-		upload install-alpha-minimal-${TIMESTAMP}.iso*
-		;;
 	stage3-openrc.spec)
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
 		;;
@@ -57,6 +54,9 @@ post_build() {
 		upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-alpha" alpha/23.0/alpha
 		;;
+	installcd-stage2-minimal.spec)
+		upload install-alpha-minimal-${TIMESTAMP}.iso*
+		;;
 	esac
 	popd >/dev/null
 }