commit: ece1c61bb0a34645a148f4bc3d4fa7f7aca3676f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 18:41:51 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 18:42:16 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ece1c61b
Switch hppa boot media to 23.0
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/hppa/installcd-stage1.spec | 8 +-
releases/specs/hppa/installcd-stage2-minimal.spec | 56 ++++----
releases/specs/hppa/netboot-hppa32.spec | 106 +++++++--------
releases/specs/hppa/netboot-hppa64.spec | 156 +++++++++++-----------
tools/catalyst-auto-hppa.conf | 30 ++---
5 files changed, 178 insertions(+), 178 deletions(-)
diff --git a/releases/specs/hppa/installcd-stage1.spec
b/releases/specs/hppa/installcd-stage1.spec
index 4ab84f4e..57b1a6cd 100644
--- a/releases/specs/hppa/installcd-stage1.spec
+++ b/releases/specs/hppa/installcd-stage1.spec
@@ -1,11 +1,11 @@
subarch: hppa1.1
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: default
-profile: default/linux/hppa/17.0
+rel_type: 23.0-default
+profile: default/linux/hppa/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-hppa1.1-openrc-@TIMESTAMP@
-pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage1
+source_subpath: 23.0-default/stage3-hppa1.1-openrc-@TIMESTAMP@
+pkgcache_path: /var/tmp/catalyst/packages/23.0-default/installcd-stage1
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/use:
compile-locales
diff --git a/releases/specs/hppa/installcd-stage2-minimal.spec
b/releases/specs/hppa/installcd-stage2-minimal.spec
index 2fb7ffa9..e56496da 100644
--- a/releases/specs/hppa/installcd-stage2-minimal.spec
+++ b/releases/specs/hppa/installcd-stage2-minimal.spec
@@ -1,17 +1,17 @@
subarch: hppa1.1
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: default
-profile: default/linux/hppa/17.0
+rel_type: 23.0-default
+profile: default/linux/hppa/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-hppa1.1-@TIMESTAMP@
-pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage2
+source_subpath: 23.0-default/livecd-stage1-hppa1.1-@TIMESTAMP@
+pkgcache_path: /var/tmp/catalyst/packages/23.0-default/installcd-stage2
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/volid: Gentoo hppa @TIMESTAMP@
livecd/bootargs: dokeymap
livecd/fstype: squashfs
-livecd/iso:
/var/tmp/catalyst/builds/default/install-hppa-minimal-@[email protected]
+livecd/iso:
/var/tmp/catalyst/builds/23.0-default/install-hppa-minimal-@[email protected]
livecd/type: gentoo-release-minimal
boot/kernel: hppa32 hppa64
@@ -125,7 +125,7 @@ livecd/unmerge:
sys-libs/db
sys-libs/gdbm
sys-libs/cracklib
- x11-misc/shared-mime-info
+ x11-misc/shared-mime-info
livecd/empty:
/boot
@@ -138,10 +138,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
@@ -226,17 +226,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
@@ -285,15 +285,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/releases/specs/hppa/netboot-hppa32.spec
b/releases/specs/hppa/netboot-hppa32.spec
index 7662d47c..24658ef2 100644
--- a/releases/specs/hppa/netboot-hppa32.spec
+++ b/releases/specs/hppa/netboot-hppa32.spec
@@ -1,14 +1,14 @@
# HPPA Netboot spec file by Guy Martin
version_stamp: @TIMESTAMP@
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-hppa1.1-openrc-@TIMESTAMP@
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot-hppa32
+source_subpath: 23.0-default/stage3-hppa1.1-openrc-@TIMESTAMP@
+pkgcache_path: /var/tmp/catalyst/packages/23.0-default/netboot-hppa32
# these shouldn't change
target: netboot
subarch: hppa1.1
-rel_type: default
-profile: default/linux/hppa/17.0
+rel_type: 23.0-default
+profile: default/linux/hppa/23.0
# netboot stuff
boot/kernel: hppa32
@@ -48,39 +48,39 @@ netboot/packages:
app-misc/screen
netboot/packages/sys-boot/palo/files:
- /sbin/palo
+ /usr/bin/palo
/usr/share/palo/iplboot
netboot/packages/sys-fs/mdadm/files:
- /sbin/mdadm
+ /usr/bin/mdadm
netboot/packages/sys-fs/e2fsprogs/files:
/usr/bin/chattr
/usr/bin/lsattr
/usr/bin/uuidgen
- /usr/sbin/mklost+found
- /sbin/e2fsck
- /sbin/debugfs
- /sbin/mke2fs
- /sbin/badblocks
- /sbin/tune2fs
- /sbin/dumpe2fs
- /sbin/blkid
- /sbin/logsave
- /sbin/e2image
- /sbin/fsck
- /sbin/e2undo
- /usr/sbin/filefrag
- /usr/sbin/uuidd
- /sbin/resize2fs
- /sbin/findfs
- /sbin/e2label
- /sbin/mkfs.ext4
- /sbin/mkfs.ext3
- /sbin/mkfs.ext2
- /sbin/fsck.ext4
- /sbin/fsck.ext3
- /sbin/fsck.ext2
+ /usr/bin/mklost+found
+ /usr/bin/e2fsck
+ /usr/bin/debugfs
+ /usr/bin/mke2fs
+ /usr/bin/badblocks
+ /usr/bin/tune2fs
+ /usr/bin/dumpe2fs
+ /usr/bin/blkid
+ /usr/bin/logsave
+ /usr/bin/e2image
+ /usr/bin/fsck
+ /usr/bin/e2undo
+ /usr/bin/filefrag
+ /usr/bin/uuidd
+ /usr/bin/resize2fs
+ /usr/bin/findfs
+ /usr/bin/e2label
+ /usr/bin/mkfs.ext4
+ /usr/bin/mkfs.ext3
+ /usr/bin/mkfs.ext2
+ /usr/bin/fsck.ext4
+ /usr/bin/fsck.ext3
+ /usr/bin/fsck.ext2
/lib/libext2fs.so.*
/lib/libcom_err.so.*
/lib/libe2p.so.*
@@ -88,17 +88,17 @@ netboot/packages/sys-fs/e2fsprogs/files:
/lib/libpthread*
netboot/packages/sys-fs/xfsprogs/files:
- /sbin/mkfs.xfs
- /sbin/fsck.xfs
- /sbin/xfs_repair
+ /usr/bin/mkfs.xfs
+ /usr/bin/fsck.xfs
+ /usr/bin/xfs_repair
/lib/librt*
netboot/packages/sys-apps/util-linux/files:
- /usr/sbin/partx
- /usr/sbin/delpart
- /usr/sbin/rtcwake
- /usr/sbin/addpart
+ /usr/bin/partx
+ /usr/bin/delpart
+ /usr/bin/rtcwake
+ /usr/bin/addpart
/usr/bin/logger
/usr/bin/setarch
/usr/bin/linux64
@@ -126,25 +126,25 @@ netboot/packages/sys-apps/util-linux/files:
/usr/bin/rev
/usr/bin/linux32
/usr/bin/colrm
- /sbin/raw
- /sbin/mkfs.bfs
- /sbin/sfdisk
- /sbin/fsck.minix
- /sbin/hwclock
- /sbin/ctrlaltdel
- /sbin/mkfs
- /sbin/mkfs.minix
- /sbin/blockdev
- /sbin/losetup
- /sbin/agetty
- /sbin/mkswap
- /sbin/pivot_root
- /sbin/fdisk
- /sbin/swapon
+ /usr/bin/raw
+ /usr/bin/mkfs.bfs
+ /usr/bin/sfdisk
+ /usr/bin/fsck.minix
+ /usr/bin/hwclock
+ /usr/bin/ctrlaltdel
+ /usr/bin/mkfs
+ /usr/bin/mkfs.minix
+ /usr/bin/blockdev
+ /usr/bin/losetup
+ /usr/bin/agetty
+ /usr/bin/mkswap
+ /usr/bin/pivot_root
+ /usr/bin/fdisk
+ /usr/bin/swapon
/bin/umount
/bin/dmesg
/bin/mount
- /sbin/swapoff
+ /usr/bin/swapoff
/lib/libblkid.so.*
/lib/libfdisk.so.*
/lib/libmount.so.*
@@ -205,7 +205,7 @@ netboot/packages/net-misc/dropbear/files:
/usr/bin/dropbearconvert
/usr/bin/dropbearkey
/usr/bin/dropbearmulti
- /usr/sbin/dropbear
+ /usr/bin/dropbear
/lib/libcrypt*
/lib/libnss_compat*
/lib/libnsl*
diff --git a/releases/specs/hppa/netboot-hppa64.spec
b/releases/specs/hppa/netboot-hppa64.spec
index e366bf3f..dd18fb71 100644
--- a/releases/specs/hppa/netboot-hppa64.spec
+++ b/releases/specs/hppa/netboot-hppa64.spec
@@ -1,14 +1,14 @@
# HPPA Netboot spec file by Guy Martin
version_stamp: @TIMESTAMP@
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-hppa2.0-openrc-@TIMESTAMP@
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot-hppa64
+source_subpath: 23.0-default/stage3-hppa2.0-openrc-@TIMESTAMP@
+pkgcache_path: /var/tmp/catalyst/packages/23.0-default/netboot-hppa64
# these shouldn't change
target: netboot
subarch: hppa2.0
-rel_type: default
-profile: default/linux/hppa/17.0
+rel_type: 23.0-default
+profile: default/linux/hppa/23.0
boot/kernel: hppa64
boot/kernel/hppa64/sources: sys-kernel/gentoo-sources
@@ -60,57 +60,57 @@ netboot/packages:
app-misc/screen
netboot/packages/sys-boot/palo/files:
- /sbin/palo
+ /usr/bin/palo
/usr/share/palo/iplboot
netboot/packages/sys-fs/mdadm/files:
- /sbin/mdadm
+ /usr/bin/mdadm
netboot/packages/sys-fs/e2fsprogs/files:
/usr/bin/chattr
/usr/bin/lsattr
/usr/bin/uuidgen
- /usr/sbin/mklost+found
- /sbin/e2fsck
- /sbin/debugfs
- /sbin/mke2fs
- /sbin/badblocks
- /sbin/tune2fs
- /sbin/dumpe2fs
- /sbin/blkid
- /sbin/logsave
- /sbin/e2image
- /sbin/fsck
- /sbin/e2undo
- /usr/sbin/filefrag
- /usr/sbin/uuidd
- /sbin/resize2fs
- /sbin/findfs
- /sbin/e2label
- /sbin/mkfs.ext4
- /sbin/mkfs.ext3
- /sbin/mkfs.ext2
- /sbin/fsck.ext4
- /sbin/fsck.ext3
- /sbin/fsck.ext2
- /lib/libext2fs.so.*
- /lib/libcom_err.so.*
- /lib/libe2p.so.*
+ /usr/bin/mklost+found
+ /usr/bin/e2fsck
+ /usr/bin/debugfs
+ /usr/bin/mke2fs
+ /usr/bin/badblocks
+ /usr/bin/tune2fs
+ /usr/bin/dumpe2fs
+ /usr/bin/blkid
+ /usr/bin/logsave
+ /usr/bin/e2image
+ /usr/bin/fsck
+ /usr/bin/e2undo
+ /usr/bin/filefrag
+ /usr/bin/uuidd
+ /usr/bin/resize2fs
+ /usr/bin/findfs
+ /usr/bin/e2label
+ /usr/bin/mkfs.ext4
+ /usr/bin/mkfs.ext3
+ /usr/bin/mkfs.ext2
+ /usr/bin/fsck.ext4
+ /usr/bin/fsck.ext3
+ /usr/bin/fsck.ext2
+ /usr/lib/libext2fs.so.*
+ /usr/lib/libcom_err.so.*
+ /usr/lib/libe2p.so.*
/usr/lib/e2initrd_helper
- /lib/libpthread*
+ /usr/lib/libpthread*
netboot/packages/sys-fs/xfsprogs/files:
- /sbin/mkfs.xfs
- /sbin/fsck.xfs
- /sbin/xfs_repair
- /lib/librt*
+ /usr/bin/mkfs.xfs
+ /usr/bin/fsck.xfs
+ /usr/bin/xfs_repair
+ /usr/lib/librt*
netboot/packages/sys-apps/util-linux/files:
- /usr/sbin/partx
- /usr/sbin/delpart
- /usr/sbin/rtcwake
- /usr/sbin/addpart
+ /usr/bin/partx
+ /usr/bin/delpart
+ /usr/bin/rtcwake
+ /usr/bin/addpart
/usr/bin/logger
/usr/bin/setarch
/usr/bin/linux64
@@ -138,30 +138,30 @@ netboot/packages/sys-apps/util-linux/files:
/usr/bin/rev
/usr/bin/linux32
/usr/bin/colrm
- /sbin/raw
- /sbin/mkfs.bfs
- /sbin/sfdisk
- /sbin/fsck.minix
- /sbin/hwclock
- /sbin/ctrlaltdel
- /sbin/mkfs
- /sbin/mkfs.minix
- /sbin/blockdev
- /sbin/losetup
- /sbin/agetty
- /sbin/mkswap
- /sbin/pivot_root
- /sbin/fdisk
- /sbin/swapon
- /bin/umount
- /bin/dmesg
- /bin/mount
- /sbin/swapoff
- /lib/libblkid.so.*
- /lib/libfdisk.so.*
- /lib/libmount.so.*
- /lib/libsmartcols.so.*
- /lib/libuuid.so.*
+ /usr/bin/raw
+ /usr/bin/mkfs.bfs
+ /usr/bin/sfdisk
+ /usr/bin/fsck.minix
+ /usr/bin/hwclock
+ /usr/bin/ctrlaltdel
+ /usr/bin/mkfs
+ /usr/bin/mkfs.minix
+ /usr/bin/blockdev
+ /usr/bin/losetup
+ /usr/bin/agetty
+ /usr/bin/mkswap
+ /usr/bin/pivot_root
+ /usr/bin/fdisk
+ /usr/bin/swapon
+ /usr/bin/umount
+ /usr/bin/dmesg
+ /usr/bin/mount
+ /usr/bin/swapoff
+ /usr/lib/libblkid.so.*
+ /usr/lib/libfdisk.so.*
+ /usr/lib/libmount.so.*
+ /usr/lib/libsmartcols.so.*
+ /usr/lib/libuuid.so.*
/usr/lib/libblkid.so
/usr/lib/libfdisk.so
/usr/lib/libmount.so
@@ -169,11 +169,11 @@ netboot/packages/sys-apps/util-linux/files:
/usr/lib/libuuid.so
netboot/packages/app-editors/nano/files:
- /bin/nano
+ /usr/bin/nano
netboot/packages/sys-libs/ncurses/files:
- /lib/libncurses.so.*
- /lib/libncursesw.so.*
+ /usr/lib/libncurses.so.*
+ /usr/lib/libncursesw.so.*
/etc/terminfo
/usr/lib/terminfo
/usr/share/tabset/std
@@ -198,8 +198,8 @@ netboot/packages/sys-libs/ncurses/files:
netboot/packages/net-misc/wget/files:
/usr/bin/wget
- /lib/libss.so.*
- /lib/libz.so.*
+ /usr/lib/libss.so.*
+ /usr/lib/libz.so.*
netboot/packages/dev-libs/openssl/files:
/usr/lib/libssl.so*
@@ -217,20 +217,20 @@ netboot/packages/net-misc/dropbear/files:
/usr/bin/dropbearconvert
/usr/bin/dropbearkey
/usr/bin/dropbearmulti
- /usr/sbin/dropbear
- /lib/libcrypt*
- /lib/libnss_compat*
- /lib/libnsl*
- /lib/libresolv*
- /lib/libnss_dns*
+ /usr/bin/dropbear
+ /usr/lib/libcrypt*
+ /usr/lib/libnss_compat*
+ /usr/lib/libnsl*
+ /usr/lib/libresolv*
+ /usr/lib/libnss_dns*
netboot/packages/dev-libs/libtommath/files:
/usr/lib/libtommath.so*
/usr/lib/libtommath.so
- /lib/libutil*
+ /usr/lib/libutil*
netboot/packages/app-misc/screen/files:
/usr/bin/screen
/etc/screenrc
- /lib/libdl*
+ /usr/lib/libdl*
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index f07c6a39..0ddc5b80 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -15,16 +15,16 @@ SETS="
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
-SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec netboot-hppa32.spec"
SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
-SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec
hppa1.1/stage3-openrc-23.spec"
+SET_hppa11_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec netboot-hppa32.spec"
SET_hppa11_systemd_23_SPECS="hppa1.1/stage1-systemd-23.spec
hppa1.1/stage3-systemd-23.spec"
SET_hppa20_openrc_23_SPECS="hppa2.0/stage1-openrc-23.spec
hppa2.0/stage3-openrc-23.spec"
+SET_hppa20_openrc_23_OPTIONAL_SPECS="netboot-hppa64.spec"
SET_hppa20_systemd_23_SPECS="hppa2.0/stage1-systemd-23.spec
hppa2.0/stage3-systemd-23.spec"
@@ -56,19 +56,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- netboot-hppa32.spec)
- ls -l netboot-hppa1.1-${TIMESTAMP}/
- mv -v netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif
netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
- upload
netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
- ;;
- netboot-hppa64.spec)
- ls -l netboot-hppa2.0-${TIMESTAMP}/
- mv -v netboot-hppa2.0-${TIMESTAMP}/hppa64-hppa.lif
netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
- upload
netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
- ;;
- installcd-stage2-minimal.spec)
- upload install-hppa-minimal-*${TIMESTAMP}*.iso*
- ;;
hppa1.1/stage3-openrc.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
;;
@@ -94,6 +81,19 @@ post_build() {
upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa2.0" hppa/23.0/hppa2.0
;;
+ netboot-hppa32.spec)
+ ls -l netboot-hppa1.1-${TIMESTAMP}/
+ mv -v netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif
netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ upload
netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ ;;
+ netboot-hppa64.spec)
+ ls -l netboot-hppa2.0-${TIMESTAMP}/
+ mv -v netboot-hppa2.0-${TIMESTAMP}/hppa64-hppa.lif
netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
+ upload
netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
+ ;;
+ installcd-stage2-minimal.spec)
+ upload install-hppa-minimal-*${TIMESTAMP}*.iso*
+ ;;
esac
popd >/dev/null
}
