commit: 8ab9c340525b0049f233ab20b7980a8b7c1ad317
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 18:51:44 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 18:51:44 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8ab9c340
Switch ia64 boot media to 23.0
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/ia64/installcd-stage1.spec | 44 ++---------------
releases/specs/ia64/installcd-stage2-minimal.spec | 58 ++++++++++-------------
tools/catalyst-auto-ia64.conf | 4 +-
3 files changed, 31 insertions(+), 75 deletions(-)
diff --git a/releases/specs/ia64/installcd-stage1.spec
b/releases/specs/ia64/installcd-stage1.spec
index 18c9b89e..863153d3 100644
--- a/releases/specs/ia64/installcd-stage1.spec
+++ b/releases/specs/ia64/installcd-stage1.spec
@@ -1,10 +1,10 @@
subarch: ia64
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: default
-profile: default/linux/ia64/17.0
+rel_type: 23.0-default
+profile: default/linux/ia64/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-ia64-openrc-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-ia64-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
@@ -17,23 +17,16 @@ livecd/use:
xml
livecd/packages:
-# app-admin/hddtemp
app-admin/pwgen
app-admin/syslog-ng
app-arch/unzip
app-crypt/gnupg
-# Not keyworded
-# app-editors/mg
app-misc/livecd-tools
app-misc/screen
app-portage/mirrorselect
app-text/wgetpaste
-# media-gfx/fbgrab
net-analyzer/traceroute
net-dialup/mingetty
-# net-dialup/penggy
-# net-dialup/pptpclient
-# net-dialup/rp-pppoe
net-fs/cifs-utils
net-fs/nfs-utils
net-irc/irssi
@@ -41,50 +34,19 @@ livecd/packages:
net-misc/dhcpcd
net-misc/iputils
net-misc/rdate
-# net-misc/vconfig
net-proxy/dante
-# Not keyworded
-# net-proxy/tsocks
-# net-wireless/ipw2100-firmware
-# net-wireless/ipw2200-firmware
-# net-wireless/prism54-firmware
-# net-wireless/wireless-tools
-# net-wireless/wpa_supplicant
-# net-wireless/zd1201-firmware
sys-apps/busybox
sys-apps/ethtool
sys-apps/fxload
sys-apps/hdparm
sys-apps/iproute2
-# sys-apps/lssbus
-# sys-apps/memtester
-# sys-apps/netplug
-# sys-apps/powerpc-utils
-# sys-apps/ibm-powerpc-utils
-# sys-apps/ibm-powerpc-utils-papr
sys-apps/sdparm
sys-block/parted
-# sys-block/partimage
-# sys-block/qla-fc-firmware
-# sys-boot/yaboot
-# sys-devel/binutils-hppa64
-# sys-devel/gcc-hppa64
sys-fs/cryptsetup
-# sys-fs/dmraid
sys-fs/dosfstools
sys-fs/e2fsprogs
-# sys-fs/hfsplusutils
-# sys-fs/hfsutils
-# sys-fs/iprutils
sys-fs/jfsutils
-# sys-fs/lsscsi
-# sys-fs/lvm2
-# sys-fs/lvm-user
-# sys-fs/mac-fdisk
sys-fs/mdadm
-# sys-fs/multipath-tools
-# Not keyworded
-# sys-fs/ntfsprogs
sys-fs/reiserfsprogs
sys-fs/xfsprogs
sys-libs/gpm
diff --git a/releases/specs/ia64/installcd-stage2-minimal.spec
b/releases/specs/ia64/installcd-stage2-minimal.spec
index 140e31cb..4cc4d5fe 100644
--- a/releases/specs/ia64/installcd-stage2-minimal.spec
+++ b/releases/specs/ia64/installcd-stage2-minimal.spec
@@ -1,15 +1,15 @@
subarch: ia64
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: default
-profile: default/linux/ia64/17.0
+rel_type: 23.0-default
+profile: default/linux/ia64/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-ia64-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-ia64-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
livecd/fstype: squashfs
-livecd/iso: /home/catalyst/builds/default/install-ia64-minimal-@[email protected]
+livecd/iso:
/home/catalyst/builds/23.0-default/install-ia64-minimal-@[email protected]
livecd/type: gentoo-release-minimal
livecd/volid: Gentoo ia64 @TIMESTAMP@
livecd/gk_mainargs: --no-lvm --no-dmraid --no-luks
@@ -29,9 +29,6 @@ boot/kernel/gentoo/use:
unicode
usb
-#boot/kernel/gentoo/packages:
-# sys-fs/ntfs3g
-
livecd/unmerge:
app-admin/eselect
app-admin/eselect-ctags
@@ -42,11 +39,9 @@ livecd/unmerge:
dev-libs/gmp
dev-libs/libxml2
dev-libs/mpfr
-# dev-libs/popt
dev-python/pycrypto
dev-util/pkgconfig
dev-util/pkgconf
-# net-misc/rsync
perl-core/PodParser
perl-core/Test-Harness
sys-apps/debianutils
@@ -87,13 +82,12 @@ livecd/empty:
/etc/cron.weekly
/etc/logrotate.d
/etc/modules.autoload.d
-# /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
@@ -181,17 +175,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
@@ -240,15 +234,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-ia64.conf b/tools/catalyst-auto-ia64.conf
index 124bad01..b4500e5a 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -12,9 +12,9 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
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"
@@ -41,7 +41,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}" >/dev/null
case ${spec} in
installcd-stage2*)
- upload builds/default/*${TIMESTAMP}*.iso*
+ upload builds/23.0-default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
