From 0e294a12b288ae57825c32384409bc2709718fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 5 Apr 2024 20:21:07 +0200 Subject: [PATCH] Switch ppc boot media to 23.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- .../specs/ppc/ppc32/installcd-stage1.spec | 6 +-- .../ppc/ppc32/installcd-stage2-minimal.spec | 52 +++++++++---------- tools/catalyst-auto-ppc.conf | 9 ++-- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/releases/specs/ppc/ppc32/installcd-stage1.spec b/releases/specs/ppc/ppc32/installcd-stage1.spec index 223526a0..f032efc7 100644 --- a/releases/specs/ppc/ppc32/installcd-stage1.spec +++ b/releases/specs/ppc/ppc32/installcd-stage1.spec @@ -1,10 +1,10 @@ subarch: ppc target: livecd-stage1 version_stamp: @TIMESTAMP@ -rel_type: default -profile: default/linux/ppc/17.0 +rel_type: 23.0-default +profile: default/linux/ppc/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-ppc-openrc-@TIMESTAMP@ +source_subpath: 23.0-default/stage3-ppc-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos diff --git a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec index 2845f3da..9f8f591b 100644 --- a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec +++ b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec @@ -1,16 +1,16 @@ subarch: ppc target: livecd-stage2 version_stamp: @TIMESTAMP@ -rel_type: default -profile: default/linux/ppc/17.0 +rel_type: 23.0-default +profile: default/linux/ppc/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/livecd-stage1-ppc-@TIMESTAMP@ +source_subpath: 23.0-default/livecd-stage1-ppc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: scandelay=10 livecd/fstype: squashfs livecd/gk_mainargs: --makeopts=-j12 -livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-@TIMESTAMP@.iso +livecd/iso: /var/tmp/catalyst/builds/23.0-default/install-powerpc-minimal-@TIMESTAMP@.iso livecd/type: gentoo-release-minimal livecd/rcadd: pbbuttonsd|default @@ -121,10 +121,10 @@ livecd/empty: /etc/modules.autoload.d /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 @@ -199,17 +199,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 @@ -253,15 +253,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-ppc.conf b/tools/catalyst-auto-ppc.conf index 1e1556e8..1a195805 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -19,7 +19,6 @@ SETS=" " SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec" -SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec" SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec" @@ -28,6 +27,7 @@ SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec" SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec" SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec" +SET_openrc_23_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec" SET_systemd_23_SPECS="ppc32/stage1-systemd-23.spec ppc32/stage3-systemd-23.spec" @@ -68,9 +68,6 @@ post_build() { pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null case ${spec} in - ppc32/installcd-stage2-minimal.spec) - upload default/*${TIMESTAMP}*.iso* - ;; ppc32/stage3-openrc.spec) upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc" ppc/17.0/ppc ;; @@ -83,7 +80,6 @@ post_build() { ppc64/stage3-musl-hardened-openrc.spec) upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64" ppc/17.0/ppc64_musl_hardened ;; - ppc32/stage3-openrc-23.spec) upload 23.0-default/stage3-ppc-openrc-*${TIMESTAMP}*.xz* ;; @@ -95,6 +91,9 @@ post_build() { upload 23.0-musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc" ppc/23.0/ppc_musl_hardened ;; + ppc32/installcd-stage2-minimal.spec) + upload 23.0-default/*${TIMESTAMP}*.iso* + ;; ppc64/stage3-openrc-23.spec) upload 23.0-default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz* ;;