commit: 6fdb075f41cf3c9844f2c398c6b645316f4ebf34
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 15 18:54:06 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 18:54:06 2025 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6fdb075f
Drop s390 netboot (there is only a 64bit kernel nowadays)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/s390/s390/netboot/misc/gentoo.exec | 12 -
.../specs/s390/s390/netboot/misc/gentoo.parmfile | 1 -
releases/specs/s390/s390/netboot/netboot.spec | 258 ---------------------
.../portage/package.license/package.license | 3 -
.../s390/netboot/portage/package.use/genkernel | 1 -
tools/catalyst-auto-s390x.conf | 7 -
6 files changed, 282 deletions(-)
diff --git a/releases/specs/s390/s390/netboot/misc/gentoo.exec
b/releases/specs/s390/s390/netboot/misc/gentoo.exec
deleted file mode 100644
index 46d91552..00000000
--- a/releases/specs/s390/s390/netboot/misc/gentoo.exec
+++ /dev/null
@@ -1,12 +0,0 @@
-/* REXX EXEC TO IPL GENTOO GNU/LINUX */
-/* FOR S/390 FROM THE VM READER. */
-/* */
-'CP CLOSE RDR'
-'PURGE RDR ALL'
-'SPOOL PUNCH * RDR'
-'PUNCH GENTOO KERNEL * (NOHEADER'
-'PUNCH GENTOO PARMFILE * (NOHEADER'
-'PUNCH GENTOO INITRD * (NOHEADER'
-'CHANGE RDR ALL KEEP NOHOLD'
-'CP IPL 000C CLEAR'
-
diff --git a/releases/specs/s390/s390/netboot/misc/gentoo.parmfile
b/releases/specs/s390/s390/netboot/misc/gentoo.parmfile
deleted file mode 100644
index c66baa3e..00000000
--- a/releases/specs/s390/s390/netboot/misc/gentoo.parmfile
+++ /dev/null
@@ -1 +0,0 @@
-root=/dev/ram0 console=ttyS0 dasd=0150
diff --git a/releases/specs/s390/s390/netboot/netboot.spec
b/releases/specs/s390/s390/netboot/netboot.spec
deleted file mode 100644
index 97663e93..00000000
--- a/releases/specs/s390/s390/netboot/netboot.spec
+++ /dev/null
@@ -1,258 +0,0 @@
-# S390 Netboot spec file, based in HPPA Netboot spec file by Guy Martin
-version_stamp: @TIMESTAMP@
-snapshot_treeish: @TREEISH@
-source_subpath: 23.0-default/stage3-s390-openrc-@TIMESTAMP@
-pkgcache_path: /var/tmp/catalyst/packages/23.0-default/netboot-s390
-
-# these shouldn't change
-target: netboot
-subarch: s390
-rel_type: 23.0-default
-profile: default/linux/s390/23.0
-portage_confdir: @REPO_DIR@/releases/specs/s390/s390/netboot/portage
-
-
-boot/kernel: netboot
-boot/kernel/netboot/sources: sys-kernel/gentoo-sources
-boot/kernel/netboot/config: ../../kconfig/netboot64.config
-boot/kernel/netboot/gk_kernargs: --all-ramdisk-modules
-
-netboot/use:
- multicall
- shadow
- readline
- ssl
- unicode
-
-netboot/packages:
- sys-apps/s390-tools
- sys-fs/e2fsprogs
- sys-apps/util-linux
- app-editors/nano
- sys-libs/ncurses
- dev-libs/popt
- net-misc/wget
- net-misc/rsync
- dev-libs/libtommath
- net-misc/dropbear
- dev-libs/openssl
- app-misc/screen
- #needed for the kernel to compile
- sys-devel/bc
-
-netboot/packages/sys-apps/s390-tools/files:
- /usr/bin/ts-shell
- /usr/bin/ttyrun
- /usr/bin/iucvtty
- /usr/bin/iucvconn
- /usr/bin/dasdinfo
- /usr/bin/vmcp
- /usr/bin/vmconvert
- /usr/bin/znetconf
- /usr/bin/cio_ignore
- /usr/bin/chzcrypt
- /usr/bin/lszcrypt
- /usr/bin/chchp
- /usr/bin/lschp
- /usr/bin/lszfcp
- /usr/bin/lsqeth
- /usr/bin/chccwdev
- /usr/bin/lscss
- /usr/bin/lstape
- /usr/bin/lsdasd
- /usr/bin/scsi_logging_level
- /usr/bin/zfcpdbf
- /usr/bin/dbginfo.sh
- /usr/bin/qethconf
- /usr/bin/qetharp
- /usr/bin/tape390_crypt
- /usr/bin/tape390_display
- /usr/bin/tunedasd
- /usr/bin/dasdview
- /usr/bin/dasdfmt
- /usr/bin/fdasd
- /usr/bin/zgetdump
- /usr/bin/zipl
- /usr/bin/hyptop
- /usr/bin/chiucvallow
- /usr/bin/ziorep_traffic
- /usr/bin/ziorep_utilization
- /usr/bin/ziomon_zfcpdd
- /usr/bin/ziomon_mgr
- /usr/bin/ziomon_util
- /usr/bin/ziorep_config
- /usr/bin/ziomon_fcpconf
- /usr/bin/ziomon
- /usr/bin/lsshut
- /usr/bin/chshut
- /usr/bin/lsreipl
- /usr/bin/chreipl
- /usr/bin/cpuplugd
- /usr/bin/vmur
- /usr/bin/mon_procd
- /usr/bin/mon_fsstatd
- /usr/bin/lsluns
- /usr/bin/chmem
- /usr/bin/lsmem
- /usr/bin/xcec-bridge
- /usr/bin/ip_watcher.pl
- /usr/bin/start_hsnc.sh
-
-netboot/packages/sys-fs/e2fsprogs/files:
- /usr/bin/chattr
- /usr/bin/lsattr
- /usr/bin/uuidgen
- /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/libblkid.so.*
- /usr/lib/libe2p.so.*
- /usr/lib/e2initrd_helper
- /usr/lib/libpthread*
-
-netboot/packages/sys-apps/util-linux/files:
- /usr/bin/partx
- /usr/bin/delpart
- /usr/bin/rtcwake
- /usr/bin/addpart
- /usr/bin/logger
- /usr/bin/setarch
- /usr/bin/linux64
- /usr/bin/column
- /usr/bin/cal
- /usr/bin/chrt
- /usr/bin/rename
- /usr/bin/colcrt
- /usr/bin/hexdump
- /usr/bin/namei
- /usr/bin/look
- /usr/bin/ipcs
- /usr/bin/flock
- /usr/bin/ionice
- /usr/bin/renice
- /usr/bin/getopt
- /usr/bin/col
- /usr/bin/taskset
- /usr/bin/ipcrm
- /usr/bin/whereis
- /usr/bin/setsid
- /usr/bin/rev
- /usr/bin/linux32
- /usr/bin/s390x
- /usr/bin/s390
- /usr/bin/colrm
- /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/libmount.so.*
- /usr/lib/libsmartcols.so.*
- /usr/lib/libuuid.so.*
- /usr/lib/libfdisk.so.*
-
-netboot/packages/app-editors/nano/files:
- /usr/bin/nano
-
-netboot/packages/sys-libs/ncurses/files:
- /usr/lib/libncurses.so.*
- /usr/lib/libncursesw.so.*
- /etc/terminfo
- /usr/lib/terminfo
- /usr/share/tabset/std
- /usr/share/tabset/stdcrt
- /usr/share/tabset/vt100
- /usr/share/tabset/vt300
- /usr/share/terminfo/a/ansi
- /usr/share/terminfo/d/dumb
- /usr/share/terminfo/e/eterm
- /usr/share/terminfo/l/linux
- /usr/share/terminfo/r/rxvt
- /usr/share/terminfo/s/screen
- /usr/share/terminfo/s/sun
- /usr/share/terminfo/v/vt100
- /usr/share/terminfo/v/vt102
- /usr/share/terminfo/v/vt200
- /usr/share/terminfo/v/vt220
- /usr/share/terminfo/v/vt52
- /usr/share/terminfo/x/xterm
- /usr/share/terminfo/x/xterm-color
- /usr/share/terminfo/x/xterm-xfree86
-
-netboot/packages/net-misc/wget/files:
- /usr/bin/wget
- /usr/lib/libss.so.*
- /usr/lib/libz.so.*
-
-netboot/packages/dev-libs/openssl/files:
- /usr/lib/libssl.so*
- /usr/lib/libcrypto.so*
-
-netboot/packages/net-misc/rsync/files:
- /usr/bin/rsync
-
-netboot/packages/dev-libs/popt/files:
- /usr/lib/libpopt.so*
-
-netboot/packages/net-misc/dropbear/files:
- /usr/bin/dbclient
- /usr/bin/dbscp
- /usr/bin/dropbearconvert
- /usr/bin/dropbearkey
- /usr/bin/dropbearmulti
- /usr/bin/dropbear
- /usr/lib/libcrypt*
- /usr/lib/libnss*
- /usr/lib/libnsl*
- /usr/lib/libresolv*
- /usr/lib/libnss_dns*
- /usr/lib/ld.so.1
- /usr/lib/ld-*
-
-netboot/packages/dev-libs/libtommath/files:
- /usr/lib/libtommath.so*
- /usr/lib/libtommath.so
- /usr/lib/libutil*
-
-netboot/packages/app-misc/screen/files:
- /usr/bin/screen
- /etc/screenrc
- /usr/lib/libdl*
-
diff --git
a/releases/specs/s390/s390/netboot/portage/package.license/package.license
b/releases/specs/s390/s390/netboot/portage/package.license/package.license
deleted file mode 100644
index c5fd72de..00000000
--- a/releases/specs/s390/s390/netboot/portage/package.license/package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# Allow linux-firmware and other required packages in @BINARY-REDISTRIBUTABLE
-# license group
-*/* @BINARY-REDISTRIBUTABLE
diff --git a/releases/specs/s390/s390/netboot/portage/package.use/genkernel
b/releases/specs/s390/s390/netboot/portage/package.use/genkernel
deleted file mode 100644
index 2c80720e..00000000
--- a/releases/specs/s390/s390/netboot/portage/package.use/genkernel
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/util-linux static-libs
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 3f5b9eac..e61f7748 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -18,7 +18,6 @@ SET_openrc_64_23_OPTIONAL_SPECS="s390x/netboot/netboot.spec"
SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec
s390x/stage3-systemd-23.spec"
SET_openrc_32_23_SPECS="s390/stage1-openrc-23.spec s390/stage3-openrc-23.spec"
-SET_openrc_32_23_OPTIONAL_SPECS="s390/netboot/netboot.spec"
SET_systemd_32_23_SPECS="s390/stage1-systemd-23.spec
s390/stage3-systemd-23.spec"
@@ -65,12 +64,6 @@ post_build() {
mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz
netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot-s390x-${TIMESTAMP}/netboot*
;;
- s390/netboot/netboot.spec)
- ls -l netboot-s390-${TIMESTAMP}/kernels/
- mv -v netboot-s390-${TIMESTAMP}/kernels/netboot
netboot-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
- mv -v netboot-s390-${TIMESTAMP}/kernels/misc/netboot.igz
netboot-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
- upload netboot-s390-${TIMESTAMP}/netboot*
- ;;
esac
popd >/dev/null
}
