commit: d4a3398ff414bd24eed0c59e0d12b31fcf65ee88 Author: Ian Jordan <immoloism <AT> gmail <DOT> com> AuthorDate: Sun Mar 9 01:18:59 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Mar 9 04:37:29 2025 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d4a3398f
Cleanup old admincd builds Specs no longer required so removed. Signed-off-by: Ian Jordan <immoloism <AT> gmail.com> releases/specs/amd64/hardened/admincd-stage1.spec | 208 ------------------ releases/specs/amd64/hardened/admincd-stage2.spec | 244 --------------------- .../specs/x86/hardened/admincd-stage1-openrc.spec | 206 ----------------- .../hardened/admincd-stage2-openrc-genkernel.spec | 234 -------------------- .../specs/x86/hardened/admincd-stage2-openrc.spec | 235 -------------------- .../installcd-stage2-minimal-openrc-genkernel.spec | 238 -------------------- tools/catalyst-auto-amd64.conf | 4 - tools/catalyst-auto-x86.conf | 4 - 8 files changed, 1373 deletions(-) diff --git a/releases/specs/amd64/hardened/admincd-stage1.spec b/releases/specs/amd64/hardened/admincd-stage1.spec deleted file mode 100644 index b22ea357..00000000 --- a/releases/specs/amd64/hardened/admincd-stage1.spec +++ /dev/null @@ -1,208 +0,0 @@ -subarch: amd64 -version_stamp: @TIMESTAMP@ -target: livecd-stage1 -rel_type: 23.0-hardened -profile: default/linux/amd64/23.0/hardened -snapshot_treeish: @TREEISH@ -source_subpath: 23.0-hardened/stage3-amd64-hardened-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/isos - -livecd/use: - alsa - caps - compile-locales - fbcon - filecaps - livecd - portaudio - socks5 - unicode - xml - -livecd/packages: - app-accessibility/brltty - app-accessibility/espeakup - app-admin/hddtemp - app-admin/pwgen - app-admin/syslog-ng - app-admin/sysstat - app-admin/testdisk - app-arch/bzip2 - app-arch/cpio - app-arch/dpkg - app-arch/gzip - app-arch/mt-st - app-arch/p7zip - app-arch/pbzip2 - app-arch/tar - app-arch/unrar - app-arch/unzip - app-backup/duplicity - app-backup/fsarchiver - app-benchmarks/bonnie - app-benchmarks/bonnie++ - app-benchmarks/dbench - app-benchmarks/iozone - app-benchmarks/stress - app-benchmarks/tiobench - app-crypt/gnupg - app-crypt/pinentry - app-editors/emacs - app-editors/hexcurse - app-editors/hexedit - app-editors/mg - app-editors/nano - app-editors/vim - app-emacs/ebuild-mode - app-emulation/cloud-init - app-emulation/xen-tools - app-misc/colordiff - app-misc/livecd-tools - app-misc/mc - app-misc/pax-utils - app-misc/screen - app-misc/tmux - app-portage/cpuid2cpuflags - app-portage/eix - app-portage/gentoolkit - app-portage/mirrorselect - app-portage/portage-utils - app-shells/bash-completion - app-shells/gentoo-bashcomp - app-shells/zsh - app-text/tree - app-text/dos2unix - app-text/wgetpaste - app-vim/gentoo-syntax - dev-debug/strace - dev-lang/perl - dev-lang/python - dev-vcs/git - media-gfx/fbgrab - media-sound/alsa-utils - net-analyzer/iptraf-ng - net-analyzer/openbsd-netcat - net-analyzer/tcptraceroute - net-analyzer/traceroute - net-analyzer/tcpdump - net-analyzer/nmap - net-dialup/mingetty - net-dialup/minicom - net-dialup/pptpclient - net-dialup/rp-pppoe - net-dns/bind-tools - net-fs/cifs-utils - net-fs/nfs-utils - net-ftp/ftp - net-ftp/ncftp - net-irc/irssi - net-misc/curl - net-misc/chrony - net-misc/dhcpcd - net-misc/iputils - net-misc/ndisc6 - net-misc/openssh - net-misc/rdate - net-misc/rsync - net-misc/telnet-bsd - net-misc/vconfig - net-misc/wget - net-misc/whois - net-proxy/dante - net-proxy/tsocks - net-vpn/openvpn - net-wireless/b43-fwcutter - net-wireless/iw - net-wireless/wireless-tools - net-wireless/wpa_supplicant - sys-apps/arch-chroot - sys-apps/arrayprobe - sys-apps/acl - sys-apps/attr - sys-apps/busybox - sys-apps/cciss_vol_status - sys-apps/chname - sys-apps/coreutils - sys-apps/dcfldd - sys-apps/diffutils - sys-apps/dmidecode - sys-apps/dstat - sys-apps/ethtool - sys-apps/file - sys-apps/findutils - sys-apps/flashrom - sys-apps/fxload - sys-apps/gawk - sys-apps/gptfdisk - sys-apps/grep - sys-apps/hdparm - sys-apps/ipmitool - sys-apps/iproute2 - sys-apps/kexec-tools - sys-apps/less - sys-apps/man-db - sys-apps/man-pages - sys-apps/man-pages-posix - sys-apps/memtester - sys-apps/memtest86+ - sys-apps/mlocate - sys-apps/netplug - sys-apps/nvme-cli - sys-apps/pciutils - sys-apps/pcmciautils - sys-apps/pv - sys-apps/sdparm - sys-apps/usbutils - sys-apps/sed - sys-apps/setserial - sys-apps/sg3_utils - sys-apps/smartmontools - sys-apps/usbutils - sys-apps/which - sys-auth/ssh-import-id - sys-block/aoetools - sys-block/fio - sys-block/mtx - sys-block/open-iscsi - sys-block/parted - sys-block/partimage - sys-block/tw_cli - sys-boot/efibootmgr - sys-boot/grub - sys-firmware/b43-firmware - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware - sys-fs/bcache-tools - sys-fs/btrfs-progs - sys-fs/cryptsetup - sys-fs/ddrescue - sys-fs/dislocker - sys-fs/dmraid - sys-fs/dosfstools - sys-fs/e2fsprogs - sys-fs/exfat-utils - sys-fs/extundelete - sys-fs/f2fs-tools - sys-fs/genfstab - sys-fs/jfsutils - sys-fs/lsscsi - sys-fs/lvm2 - sys-fs/mac-fdisk - sys-fs/mdadm - sys-fs/multipath-tools - sys-fs/ncdu - sys-fs/ntfs3g - sys-fs/reiserfsprogs - sys-fs/xfsdump - sys-fs/xfsprogs - sys-kernel/linux-firmware - sys-libs/gpm - sys-libs/libsmbios - sys-power/acpid - sys-process/htop - sys-process/lsof - sys-process/iotop - sys-process/procps - sys-process/psmisc - www-client/links diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec deleted file mode 100644 index 5c3c7c69..00000000 --- a/releases/specs/amd64/hardened/admincd-stage2.spec +++ /dev/null @@ -1,244 +0,0 @@ -subarch: amd64 -version_stamp: @TIMESTAMP@ -target: livecd-stage2 -rel_type: 23.0-hardened -profile: default/linux/amd64/23.0/hardened -snapshot_treeish: @TREEISH@ -source_subpath: 23.0-hardened/livecd-stage1-amd64-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/isos - -livecd/bootargs: dokeymap -livecd/fstype: squashfs -livecd/iso: admincd-amd64-@[email protected] -livecd/type: gentoo-release-minimal -livecd/volid: Gentoo-amd64-AdminCD-@DATESTAMP@ - -boot/kernel: gentoo - -boot/kernel/gentoo/distkernel: yes -boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid -o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -i /lib/keymaps /lib/keymaps -I busybox -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/dist-amd64-livecd.config -boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta - -livecd/unmerge: - app-admin/eselect - app-admin/eselect-ctags - app-admin/eselect-vi - app-admin/perl-cleaner - app-admin/python-updater - app-arch/cpio - dev-build/libtool - dev-lang/rust-bin - dev-libs/gmp - dev-libs/libxml2 - dev-libs/mpfr - dev-python/pycrypto - dev-util/pkgconf - perl-core/PodParser - perl-core/Test-Harness - sys-apps/debianutils - sys-apps/groff - sys-apps/man-db - sys-apps/man-pages - sys-apps/memtest86+ - sys-apps/miscfiles - sys-apps/sandbox - sys-apps/texinfo - dev-build/autoconf - dev-build/autoconf-wrapper - dev-build/automake - dev-build/automake-wrapper - sys-devel/binutils - sys-devel/binutils-config - sys-devel/bison - sys-devel/flex - sys-devel/gcc - sys-devel/gcc-config - sys-devel/gettext - sys-devel/gnuconfig - sys-devel/m4 - dev-build/make - sys-devel/patch - sys-libs/db - sys-libs/gdbm - sys-kernel/genkernel - sys-kernel/linux-headers - -livecd/empty: - /boot - /etc/cron.daily - /etc/cron.hourly - /etc/cron.monthly - /etc/cron.weekly - /etc/kernel/config.d - /etc/logrotate.d - /etc/modules.autoload.d - /etc/runlevels/single - /etc/skel - /usr/lib/dev-state - /usr/lib/udev-state - /usr/lib64/dev-state - /usr/lib64/udev-state - /root/.ccache - /tmp - /usr/diet/include - /usr/diet/man - /usr/include - /usr/i?86-gentoo-linux-uclibc - /usr/i?86-pc-linux-uclibc - /usr/lib/X11/config - /usr/lib/X11/doc - /usr/lib/X11/etc - /usr/lib/awk - /usr/lib/ccache - /usr/lib/gcc-config - /usr/lib/nfs - /usr/lib/perl5/site_perl - /usr/lib/portage - /usr/lib64/X11/config - /usr/lib64/X11/doc - /usr/lib64/X11/etc - /usr/lib64/awk - /usr/lib64/ccache - /usr/lib64/gcc-config - /usr/lib64/nfs - /usr/lib64/perl5/site_perl - /usr/lib64/portage - /usr/local - /usr/portage - /usr/share/aclocal - /usr/share/baselayout - /usr/share/binutils-data - /usr/share/consolefonts/partialfonts - /usr/share/consoletrans - /usr/share/dict - /usr/share/et - /usr/share/gcc-data - /usr/share/genkernel - /usr/share/gettext - /usr/share/glib-2.0 - /usr/share/gnuconfig - /usr/share/gtk-doc - /usr/share/i18n - /usr/share/info - /usr/share/lcms - /usr/share/libtool - /usr/share/rfc - /usr/share/ss - /usr/share/state - /usr/share/texinfo - /usr/share/unimaps - /usr/share/zoneinfo - /usr/src - /var/cache - /var/empty - /var/lib/portage - /var/log - /var/spool - /var/state - /var/tmp - -livecd/rm: - /boot/System* - /boot/initr* - /boot/kernel* - /etc/*- - /etc/*.old - /etc/default/audioctl - /etc/dispatch-conf.conf - /etc/env.d/05binutils - /etc/env.d/05gcc - /etc/etc-update.conf - /etc/hosts.bck - /etc/issue* - /etc/genkernel.conf - /etc/make.conf* - /etc/make.globals - /etc/make.profile - /etc/man.conf - /etc/resolv.conf - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/cpp - /root/.bash_history - /root/.viminfo - /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 - /usr/bin/audioctl - /usr/bin/c++* - /usr/bin/cc - /usr/bin/cjpeg - /usr/bin/cpp - /usr/bin/djpeg - /usr/bin/ebuild - /usr/bin/egencache - /usr/bin/emerge - /usr/bin/emerge-webrsync - /usr/bin/emirrordist - /usr/bin/elftoaout - /usr/bin/f77 - /usr/bin/g++* - /usr/bin/g77 - /usr/bin/gcc* - /usr/bin/genkernel - /usr/bin/gprof - /usr/bin/i?86-gentoo-linux-uclibc-* - /usr/bin/i?86-pc-linux-* - /usr/bin/jpegtran - /usr/bin/ld - /usr/bin/libpng* - /usr/bin/nm - /usr/bin/objcopy - /usr/bin/objdump - /usr/bin/piggyback* - /usr/bin/portageq - /usr/bin/ranlib - /usr/bin/readelf - /usr/bin/size - /usr/bin/strip - /usr/bin/tbz2tool - /usr/bin/xpak - /usr/bin/yacc - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/perl5/site_perl - /usr/lib*/gcc-lib/*/*/libgcj* - /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* - /usr/share/consolefonts/9* - /usr/share/consolefonts/A* - /usr/share/consolefonts/C* - /usr/share/consolefonts/E* - /usr/share/consolefonts/G* - /usr/share/consolefonts/L* - /usr/share/consolefonts/M* - /usr/share/consolefonts/R* - /usr/share/consolefonts/a* - /usr/share/consolefonts/c* - /usr/share/consolefonts/dr* - /usr/share/consolefonts/g* - /usr/share/consolefonts/i* - /usr/share/consolefonts/k* - /usr/share/consolefonts/l* - /usr/share/consolefonts/r* - /usr/share/consolefonts/s* - /usr/share/consolefonts/t* - /usr/share/consolefonts/v* - /usr/share/misc/*.old diff --git a/releases/specs/x86/hardened/admincd-stage1-openrc.spec b/releases/specs/x86/hardened/admincd-stage1-openrc.spec deleted file mode 100644 index e356b279..00000000 --- a/releases/specs/x86/hardened/admincd-stage1-openrc.spec +++ /dev/null @@ -1,206 +0,0 @@ -subarch: i686 -version_stamp: hardened-openrc-@TIMESTAMP@ -target: livecd-stage1 -rel_type: 23.0-hardened -profile: default/linux/x86/23.0/i686/hardened -snapshot_treeish: @TREEISH@ -source_subpath: 23.0-hardened/stage3-i686-hardened-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/isos-x86 - -livecd/use: - alsa - caps - compile-locales - fbcon - filecaps - livecd - portaudio - socks5 - unicode - xml - -livecd/packages: - app-accessibility/brltty - app-accessibility/espeakup - app-admin/hddtemp - app-admin/pwgen - app-admin/syslog-ng - app-admin/sysstat - app-admin/testdisk - app-arch/bzip2 - app-arch/cpio - app-arch/dpkg - app-arch/gzip - app-arch/mt-st - app-arch/p7zip - app-arch/pbzip2 - app-arch/tar - app-arch/unrar - app-arch/unzip -# remove duplicity until rust/sse2 situation is resolved -# app-backup/duplicity - app-benchmarks/bonnie - app-benchmarks/bonnie++ - app-benchmarks/dbench - app-benchmarks/iozone - app-benchmarks/stress - app-benchmarks/tiobench - app-crypt/gnupg - app-crypt/pinentry - app-editors/emacs - app-editors/hexcurse - app-editors/hexedit - app-editors/mg - app-editors/nano - app-editors/vim - app-emacs/ebuild-mode -# remove clout-init until rust/sse2 situation is resolved -# app-emulation/cloud-init - app-emulation/xen-tools - app-misc/colordiff - app-misc/livecd-tools - app-misc/mc - app-misc/pax-utils - app-misc/screen - app-misc/tmux - app-portage/cpuid2cpuflags - app-portage/eix - app-portage/gentoolkit - app-portage/mirrorselect - app-portage/portage-utils - app-shells/bash-completion - app-shells/gentoo-bashcomp - app-shells/zsh - app-text/tree - app-text/dos2unix - app-text/wgetpaste - app-vim/gentoo-syntax - dev-debug/strace - dev-lang/perl - dev-lang/python - dev-vcs/git - media-gfx/fbgrab - media-sound/alsa-utils - net-analyzer/iptraf-ng - net-analyzer/openbsd-netcat - net-analyzer/tcptraceroute - net-analyzer/traceroute - net-analyzer/tcpdump - net-analyzer/nmap - net-dialup/mingetty - net-dialup/minicom - net-dialup/pptpclient - net-dialup/rp-pppoe - net-dns/bind-tools - net-fs/cifs-utils - net-fs/nfs-utils - net-ftp/ftp - net-ftp/ncftp - net-irc/irssi - net-misc/curl - net-misc/chrony - net-misc/dhcpcd - net-misc/iputils - net-misc/ndisc6 - net-misc/openssh - net-misc/rdate - net-misc/rsync - net-misc/telnet-bsd - net-misc/vconfig - net-misc/wget - net-misc/whois - net-proxy/dante - net-proxy/tsocks - net-vpn/openvpn - net-wireless/b43-fwcutter - net-wireless/iw - net-wireless/wireless-tools - net-wireless/wpa_supplicant - sys-apps/arch-chroot - sys-apps/arrayprobe - sys-apps/acl - sys-apps/attr - sys-apps/busybox - sys-apps/cciss_vol_status - sys-apps/chname - sys-apps/coreutils - sys-apps/dcfldd - sys-apps/diffutils - sys-apps/dmidecode - sys-apps/dstat - sys-apps/ethtool - sys-apps/file - sys-apps/findutils - sys-apps/flashrom - sys-apps/fxload - sys-apps/gawk - sys-apps/gptfdisk - sys-apps/grep - sys-apps/hdparm - sys-apps/ipmitool - sys-apps/iproute2 - sys-apps/less - sys-apps/man-db - sys-apps/man-pages - sys-apps/man-pages-posix - sys-apps/memtester - sys-apps/memtest86+ - sys-apps/mlocate - sys-apps/netplug - sys-apps/pciutils - sys-apps/pcmciautils - sys-apps/pv - sys-apps/sdparm - sys-apps/usbutils - sys-apps/sed - sys-apps/setserial - sys-apps/sg3_utils - sys-apps/smartmontools - sys-apps/usbutils - sys-apps/which - sys-auth/ssh-import-id - sys-block/aoetools - sys-block/fio - sys-block/mtx - sys-block/open-iscsi - sys-block/parted - sys-block/partimage - sys-block/tw_cli - sys-boot/grub - sys-firmware/b43-firmware - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware - sys-fs/bcache-tools - sys-fs/btrfs-progs - sys-fs/cryptsetup - sys-fs/ddrescue - sys-fs/dislocker - sys-fs/dmraid - sys-fs/dosfstools - sys-fs/e2fsprogs - sys-fs/exfat-utils - sys-fs/extundelete - sys-fs/f2fs-tools - sys-fs/genfstab - sys-fs/jfsutils - sys-fs/lsscsi - sys-fs/lvm2 - sys-fs/mac-fdisk - sys-fs/mdadm - sys-fs/multipath-tools - sys-fs/ncdu - sys-fs/ntfs3g - sys-fs/reiserfsprogs - sys-fs/xfsdump - sys-fs/xfsprogs - sys-kernel/linux-firmware - sys-libs/gpm - sys-libs/libsmbios - sys-power/acpid - sys-process/htop - sys-process/lsof - sys-process/iotop - sys-process/procps - sys-process/psmisc - www-client/links diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc-genkernel.spec b/releases/specs/x86/hardened/admincd-stage2-openrc-genkernel.spec deleted file mode 100644 index d669439d..00000000 --- a/releases/specs/x86/hardened/admincd-stage2-openrc-genkernel.spec +++ /dev/null @@ -1,234 +0,0 @@ -subarch: i686 -version_stamp: hardened-openrc-@TIMESTAMP@ -target: livecd-stage2 -rel_type: 23.0-hardened -profile: default/linux/x86/23.0/i686/hardened -snapshot_treeish: @TREEISH@ -source_subpath: 23.0-hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/isos-x86 - -livecd/bootargs: dokeymap -livecd/fstype: squashfs -livecd/iso: admincd-x86-@[email protected] -livecd/type: gentoo-release-minimal -livecd/volid: Gentoo x86 AdminCD @TIMESTAMP@ - -boot/kernel: gentoo - -boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/x86-5.4.38.config - -boot/kernel/gentoo/packages: --usepkg n broadcom-sta - -livecd/unmerge: - app-admin/eselect - app-admin/eselect-ctags - app-admin/eselect-vi - app-admin/perl-cleaner - app-admin/python-updater - app-arch/cpio - dev-build/libtool - dev-lang/rust-bin - dev-libs/gmp - dev-libs/libxml2 - dev-libs/mpfr - dev-python/pycrypto - dev-util/pkgconf - perl-core/PodParser - perl-core/Test-Harness - sys-apps/debianutils - sys-apps/groff - sys-apps/man-db - sys-apps/man-pages - sys-apps/memtest86+ - sys-apps/miscfiles - sys-apps/sandbox - sys-apps/texinfo - dev-build/autoconf - dev-build/autoconf-wrapper - dev-build/automake - dev-build/automake-wrapper - sys-devel/binutils - sys-devel/binutils-config - sys-devel/bison - sys-devel/flex - sys-devel/gcc - sys-devel/gcc-config - sys-devel/gettext - sys-devel/gnuconfig - sys-devel/m4 - dev-build/make - sys-devel/patch - sys-libs/db - sys-libs/gdbm - sys-kernel/genkernel - sys-kernel/linux-headers - -livecd/empty: - /boot - /etc/cron.daily - /etc/cron.hourly - /etc/cron.monthly - /etc/cron.weekly - /etc/logrotate.d - /etc/modules.autoload.d - /etc/runlevels/single - /etc/skel - /usr/lib/dev-state - /usr/lib/udev-state - /root/.ccache - /tmp - /usr/diet/include - /usr/diet/man - /usr/include - /usr/i?86-gentoo-linux-uclibc - /usr/i?86-pc-linux-uclibc - /usr/lib/X11/config - /usr/lib/X11/doc - /usr/lib/X11/etc - /usr/lib/awk - /usr/lib/ccache - /usr/lib/gcc-config - /usr/lib/nfs - /usr/lib/perl5/site_perl - /usr/lib/portage - /usr/local - /usr/portage - /usr/share/aclocal - /usr/share/baselayout - /usr/share/binutils-data - /usr/share/consolefonts/partialfonts - /usr/share/consoletrans - /usr/share/dict - /usr/share/et - /usr/share/gcc-data - /usr/share/genkernel - /usr/share/gettext - /usr/share/glib-2.0 - /usr/share/gnuconfig - /usr/share/gtk-doc - /usr/share/i18n - /usr/share/info - /usr/share/lcms - /usr/share/libtool - /usr/share/locale - /usr/share/man - /usr/share/rfc - /usr/share/ss - /usr/share/state - /usr/share/texinfo - /usr/share/unimaps - /usr/share/zoneinfo - /usr/src - /var/cache - /var/empty - /var/lib/portage - /var/log - /var/spool - /var/state - /var/tmp - -livecd/rm: - /boot/System* - /boot/initr* - /boot/kernel* - /etc/*- - /etc/*.old - /etc/default/audioctl - /etc/dispatch-conf.conf - /etc/env.d/05binutils - /etc/env.d/05gcc - /etc/etc-update.conf - /etc/hosts.bck - /etc/issue* - /etc/genkernel.conf - /etc/make.conf* - /etc/make.globals - /etc/make.profile - /etc/man.conf - /etc/resolv.conf - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/cpp - /root/.bash_history - /root/.viminfo - /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 - /usr/bin/audioctl - /usr/bin/c++* - /usr/bin/cc - /usr/bin/cjpeg - /usr/bin/cpp - /usr/bin/djpeg - /usr/bin/ebuild - /usr/bin/egencache - /usr/bin/emerge - /usr/bin/emerge-webrsync - /usr/bin/emirrordist - /usr/bin/elftoaout - /usr/bin/f77 - /usr/bin/g++* - /usr/bin/g77 - /usr/bin/gcc* - /usr/bin/genkernel - /usr/bin/gprof - /usr/bin/i?86-gentoo-linux-uclibc-* - /usr/bin/i?86-pc-linux-* - /usr/bin/jpegtran - /usr/bin/ld - /usr/bin/libpng* - /usr/bin/nm - /usr/bin/objcopy - /usr/bin/objdump - /usr/bin/piggyback* - /usr/bin/portageq - /usr/bin/ranlib - /usr/bin/readelf - /usr/bin/size - /usr/bin/strip - /usr/bin/tbz2tool - /usr/bin/xpak - /usr/bin/yacc - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/perl5/site_perl - /usr/lib*/gcc-lib/*/*/libgcj* - /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* - /usr/share/consolefonts/9* - /usr/share/consolefonts/A* - /usr/share/consolefonts/C* - /usr/share/consolefonts/E* - /usr/share/consolefonts/G* - /usr/share/consolefonts/L* - /usr/share/consolefonts/M* - /usr/share/consolefonts/R* - /usr/share/consolefonts/a* - /usr/share/consolefonts/c* - /usr/share/consolefonts/dr* - /usr/share/consolefonts/g* - /usr/share/consolefonts/i* - /usr/share/consolefonts/k* - /usr/share/consolefonts/l* - /usr/share/consolefonts/r* - /usr/share/consolefonts/s* - /usr/share/consolefonts/t* - /usr/share/consolefonts/v* - /usr/share/misc/*.old diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec deleted file mode 100644 index 1f1f9291..00000000 --- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec +++ /dev/null @@ -1,235 +0,0 @@ -subarch: i686 -version_stamp: hardened-openrc-@TIMESTAMP@ -target: livecd-stage2 -rel_type: 23.0-hardened -profile: default/linux/x86/23.0/i686/hardened -snapshot_treeish: @TREEISH@ -source_subpath: 23.0-hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/isos-x86 - -livecd/bootargs: dokeymap -livecd/fstype: squashfs -livecd/iso: admincd-x86-@[email protected] -livecd/type: gentoo-release-minimal -livecd/volid: Gentoo-x86-AdminCD-@DATESTAMP@ - -boot/kernel: gentoo - -boot/kernel/gentoo/distkernel: yes -boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid -o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -i /lib/keymaps /lib/keymaps -I busybox -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/dist-x86-livecd.config - -boot/kernel/gentoo/packages: --usepkg n broadcom-sta - -livecd/unmerge: - app-admin/eselect - app-admin/eselect-ctags - app-admin/eselect-vi - app-admin/perl-cleaner - app-admin/python-updater - app-arch/cpio - dev-build/libtool - dev-lang/rust-bin - dev-libs/gmp - dev-libs/libxml2 - dev-libs/mpfr - dev-python/pycrypto - dev-util/pkgconf - perl-core/PodParser - perl-core/Test-Harness - sys-apps/debianutils - sys-apps/groff - sys-apps/man-db - sys-apps/man-pages - sys-apps/memtest86+ - sys-apps/miscfiles - sys-apps/sandbox - sys-apps/texinfo - dev-build/autoconf - dev-build/autoconf-wrapper - dev-build/automake - dev-build/automake-wrapper - sys-devel/binutils - sys-devel/binutils-config - sys-devel/bison - sys-devel/flex - sys-devel/gcc - sys-devel/gcc-config - sys-devel/gettext - sys-devel/gnuconfig - sys-devel/m4 - dev-build/make - sys-devel/patch - sys-libs/db - sys-libs/gdbm - sys-kernel/genkernel - sys-kernel/linux-headers - -livecd/empty: - /boot - /etc/cron.daily - /etc/cron.hourly - /etc/cron.monthly - /etc/cron.weekly - /etc/logrotate.d - /etc/modules.autoload.d - /etc/runlevels/single - /etc/skel - /usr/lib/dev-state - /usr/lib/udev-state - /root/.ccache - /tmp - /usr/diet/include - /usr/diet/man - /usr/include - /usr/i?86-gentoo-linux-uclibc - /usr/i?86-pc-linux-uclibc - /usr/lib/X11/config - /usr/lib/X11/doc - /usr/lib/X11/etc - /usr/lib/awk - /usr/lib/ccache - /usr/lib/gcc-config - /usr/lib/nfs - /usr/lib/perl5/site_perl - /usr/lib/portage - /usr/local - /usr/portage - /usr/share/aclocal - /usr/share/baselayout - /usr/share/binutils-data - /usr/share/consolefonts/partialfonts - /usr/share/consoletrans - /usr/share/dict - /usr/share/et - /usr/share/gcc-data - /usr/share/genkernel - /usr/share/gettext - /usr/share/glib-2.0 - /usr/share/gnuconfig - /usr/share/gtk-doc - /usr/share/i18n - /usr/share/info - /usr/share/lcms - /usr/share/libtool - /usr/share/locale - /usr/share/man - /usr/share/rfc - /usr/share/ss - /usr/share/state - /usr/share/texinfo - /usr/share/unimaps - /usr/share/zoneinfo - /usr/src - /var/cache - /var/empty - /var/lib/portage - /var/log - /var/spool - /var/state - /var/tmp - -livecd/rm: - /boot/System* - /boot/initr* - /boot/kernel* - /etc/*- - /etc/*.old - /etc/default/audioctl - /etc/dispatch-conf.conf - /etc/env.d/05binutils - /etc/env.d/05gcc - /etc/etc-update.conf - /etc/hosts.bck - /etc/issue* - /etc/genkernel.conf - /etc/make.conf* - /etc/make.globals - /etc/make.profile - /etc/man.conf - /etc/resolv.conf - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/cpp - /root/.bash_history - /root/.viminfo - /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 - /usr/bin/audioctl - /usr/bin/c++* - /usr/bin/cc - /usr/bin/cjpeg - /usr/bin/cpp - /usr/bin/djpeg - /usr/bin/ebuild - /usr/bin/egencache - /usr/bin/emerge - /usr/bin/emerge-webrsync - /usr/bin/emirrordist - /usr/bin/elftoaout - /usr/bin/f77 - /usr/bin/g++* - /usr/bin/g77 - /usr/bin/gcc* - /usr/bin/genkernel - /usr/bin/gprof - /usr/bin/i?86-gentoo-linux-uclibc-* - /usr/bin/i?86-pc-linux-* - /usr/bin/jpegtran - /usr/bin/ld - /usr/bin/libpng* - /usr/bin/nm - /usr/bin/objcopy - /usr/bin/objdump - /usr/bin/piggyback* - /usr/bin/portageq - /usr/bin/ranlib - /usr/bin/readelf - /usr/bin/size - /usr/bin/strip - /usr/bin/tbz2tool - /usr/bin/xpak - /usr/bin/yacc - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/perl5/site_perl - /usr/lib*/gcc-lib/*/*/libgcj* - /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* - /usr/share/consolefonts/9* - /usr/share/consolefonts/A* - /usr/share/consolefonts/C* - /usr/share/consolefonts/E* - /usr/share/consolefonts/G* - /usr/share/consolefonts/L* - /usr/share/consolefonts/M* - /usr/share/consolefonts/R* - /usr/share/consolefonts/a* - /usr/share/consolefonts/c* - /usr/share/consolefonts/dr* - /usr/share/consolefonts/g* - /usr/share/consolefonts/i* - /usr/share/consolefonts/k* - /usr/share/consolefonts/l* - /usr/share/consolefonts/r* - /usr/share/consolefonts/s* - /usr/share/consolefonts/t* - /usr/share/consolefonts/v* - /usr/share/misc/*.old diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc-genkernel.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc-genkernel.spec deleted file mode 100644 index 878bbc6e..00000000 --- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc-genkernel.spec +++ /dev/null @@ -1,238 +0,0 @@ -subarch: i486 -version_stamp: openrc-@TIMESTAMP@ -target: livecd-stage2 -rel_type: 23.0-default -profile: default/linux/x86/23.0/i486 -snapshot_treeish: @TREEISH@ -source_subpath: 23.0-default/livecd-stage1-i486-openrc-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/isos-x86 - -livecd/bootargs: dokeymap -#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 -livecd/fstype: squashfs -livecd/iso: install-x86-minimal-@[email protected] -livecd/type: gentoo-release-minimal -livecd/volid: Gentoo x86 @TIMESTAMP@ - -boot/kernel: gentoo - -boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/x86-5.4.38.config - -boot/kernel/gentoo/packages: --usepkg n broadcom-sta - -livecd/unmerge: - app-admin/eselect - app-admin/eselect-ctags - app-admin/eselect-vi - app-admin/perl-cleaner - app-admin/python-updater - app-arch/cpio - dev-build/libtool - dev-lang/rust-bin - dev-libs/gmp - dev-libs/libxml2 - dev-libs/mpfr - dev-python/pycrypto - perl-core/PodParser - perl-core/Test-Harness - sys-apps/debianutils - sys-apps/diffutils - sys-apps/groff - sys-apps/man-db - sys-apps/man-pages - sys-apps/memtest86+ - sys-apps/miscfiles - sys-apps/sandbox - sys-apps/texinfo - dev-build/autoconf - dev-build/autoconf-wrapper - dev-build/automake - dev-build/automake-wrapper - sys-devel/binutils - sys-devel/binutils-config - sys-devel/bison - sys-devel/flex - sys-devel/gcc - sys-devel/gcc-config - sys-devel/gettext - sys-devel/gnuconfig - sys-devel/m4 - dev-build/make - sys-devel/patch - sys-libs/db - sys-libs/gdbm - sys-kernel/genkernel - sys-kernel/linux-headers - -livecd/empty: - /boot - /etc/cron.daily - /etc/cron.hourly - /etc/cron.monthly - /etc/cron.weekly - /etc/logrotate.d - /etc/modules.autoload.d - /etc/rsync - /etc/runlevels/single - /etc/skel - /usr/lib/dev-state - /usr/lib/udev-state - /root/.ccache - /tmp - /usr/diet/include - /usr/diet/man - /usr/include - /usr/i?86-gentoo-linux-uclibc - /usr/i?86-pc-linux-uclibc - /usr/lib/X11/config - /usr/lib/X11/doc - /usr/lib/X11/etc - /usr/lib/awk - /usr/lib/ccache - /usr/lib/gcc-config - /usr/lib/nfs - /usr/lib/perl5/site_perl - /usr/lib/portage - /usr/local - /usr/portage - /usr/share/aclocal - /usr/share/baselayout - /usr/share/binutils-data - /usr/share/consolefonts/partialfonts - /usr/share/consoletrans - /usr/share/dict - /usr/share/doc - /usr/share/emacs - /usr/share/et - /usr/share/gcc-data - /usr/share/genkernel - /usr/share/gettext - /usr/share/glib-2.0 - /usr/share/gnuconfig - /usr/share/gtk-doc - /usr/share/i18n - /usr/share/info - /usr/share/lcms - /usr/share/libtool - /usr/share/locale - /usr/share/man - /usr/share/rfc - /usr/share/ss - /usr/share/state - /usr/share/texinfo - /usr/share/unimaps - /usr/share/zoneinfo - /usr/src - /var/cache - /var/empty - /var/lib/portage - /var/log - /var/spool - /var/state - /var/tmp - -livecd/rm: - /boot/System* - /boot/initr* - /boot/kernel* - /etc/*- - /etc/*.old - /etc/default/audioctl - /etc/dispatch-conf.conf - /etc/env.d/05binutils - /etc/env.d/05gcc - /etc/etc-update.conf - /etc/hosts.bck - /etc/issue* - /etc/genkernel.conf - /etc/make.conf* - /etc/make.globals - /etc/make.profile - /etc/man.conf - /etc/resolv.conf - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/cpp - /root/.bash_history - /root/.viminfo - /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 - /usr/bin/audioctl - /usr/bin/c++* - /usr/bin/cc - /usr/bin/cjpeg - /usr/bin/cpp - /usr/bin/djpeg - /usr/bin/ebuild - /usr/bin/egencache - /usr/bin/emerge - /usr/bin/emerge-webrsync - /usr/bin/emirrordist - /usr/bin/elftoaout - /usr/bin/f77 - /usr/bin/g++* - /usr/bin/g77 - /usr/bin/gcc* - /usr/bin/genkernel - /usr/bin/gprof - /usr/bin/i?86-gentoo-linux-uclibc-* - /usr/bin/i?86-pc-linux-* - /usr/bin/jpegtran - /usr/bin/ld - /usr/bin/libpng* - /usr/bin/nm - /usr/bin/objcopy - /usr/bin/objdump - /usr/bin/piggyback* - /usr/bin/portageq - /usr/bin/ranlib - /usr/bin/readelf - /usr/bin/size - /usr/bin/strip - /usr/bin/tbz2tool - /usr/bin/xpak - /usr/bin/yacc - /usr/lib*/*.a - /usr/lib*/*.la - /usr/lib*/perl5/site_perl - /usr/lib*/gcc-lib/*/*/libgcj* - /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* - /usr/share/consolefonts/9* - /usr/share/consolefonts/A* - /usr/share/consolefonts/C* - /usr/share/consolefonts/E* - /usr/share/consolefonts/G* - /usr/share/consolefonts/L* - /usr/share/consolefonts/M* - /usr/share/consolefonts/R* - /usr/share/consolefonts/a* - /usr/share/consolefonts/c* - /usr/share/consolefonts/dr* - /usr/share/consolefonts/g* - /usr/share/consolefonts/i* - /usr/share/consolefonts/k* - /usr/share/consolefonts/l* - /usr/share/consolefonts/r* - /usr/share/consolefonts/s* - /usr/share/consolefonts/t* - /usr/share/consolefonts/v* - /usr/share/misc/*.old diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index a6ece5ef..0dc32c1f 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -43,7 +43,6 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec" SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec" SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec" -SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec hardened/stage3-systemd-23.spec" @@ -178,9 +177,6 @@ post_build() { upload stage3-amd64-hardened-systemd-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64" amd64/23.0/x86-64_hardened ;; - hardened/admincd-stage2.spec) - upload admincd-amd64-${TIMESTAMP}.iso* - ;; hardened-nomultilib/stage3-openrc-23.spec) upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz* ;; diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index ea4b78d8..3a502caa 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -37,7 +37,6 @@ SET_i686_t64_openrc_23_SPECS="i686-t64/stage1-openrc-23.spec i686-t64/stage3-ope SET_i686_t64_systemd_23_SPECS="i686-t64/stage1-systemd-23.spec i686-t64/stage3-systemd-23.spec" SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec" -SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec" SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec" @@ -119,9 +118,6 @@ post_build() { upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-i686" x86/23.0/i686_hardened ;; - hardened/admincd-stage2-openrc.spec) - upload admincd-x86-${TIMESTAMP}.iso* - ;; esac popd >/dev/null || exit
