commit: 71c15eec945ce183b2f77777224ca937b480c666
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 5 18:53:38 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 18:53:38 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=71c15eec
Switch ppc64le boot media to 23.0
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/ppc/ppc64le/installcd-stage1.spec | 6 +--
.../ppc/ppc64le/installcd-stage2-minimal.spec | 50 +++++++++++-----------
tools/catalyst-auto-ppc64le.conf | 4 +-
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/releases/specs/ppc/ppc64le/installcd-stage1.spec
b/releases/specs/ppc/ppc64le/installcd-stage1.spec
index 68960307..a744cd0d 100644
--- a/releases/specs/ppc/ppc64le/installcd-stage1.spec
+++ b/releases/specs/ppc/ppc64le/installcd-stage1.spec
@@ -1,10 +1,10 @@
subarch: ppc64le
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: default
-profile: default/linux/ppc64le/17.0
+rel_type: 23.0-default
+profile: default/linux/ppc64le/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-ppc64le-openrc-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-ppc64le-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
index 133df307..adef9670 100644
--- a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
+++ b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
subarch: ppc64le
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: default
-profile: default/linux/ppc64le/17.0
+rel_type: 23.0-default
+profile: default/linux/ppc64le/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-ppc64le-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-ppc64le-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -84,10 +84,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/include
@@ -158,17 +158,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
@@ -211,15 +211,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-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 75356aa0..aba6051a 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -19,7 +19,6 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec
stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
@@ -29,6 +28,7 @@
SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stag
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -68,7 +68,7 @@ post_build() {
case ${spec} in
installcd-stage2-minimal.spec)
- upload default/*${TIMESTAMP}*.iso*
+ upload 23.0-default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
