diff --git a/releases/specs/amd64/livecd-stage1.spec b/releases/specs/amd64/livecd-stage1.spec deleted file mode 100644 index a7743acd..00000000 --- a/releases/specs/amd64/livecd-stage1.spec +++ /dev/null @@ -1,151 +0,0 @@ -subarch: amd64 -version_stamp: installer-@TIMESTAMP@ -target: livecd-stage1 -rel_type: default -profile: default/linux/amd64/17.0/desktop -snapshot: @TIMESTAMP@ -source_subpath: default/stage3-amd64-desktop-@TIMESTAMP@ -livecd/use: - branding - livecd - socks5 - -livecd/packages: - app-accessibility/brltty - app-admin/hddtemp - app-admin/ide-smart - app-admin/logrotate - app-admin/pwgen - app-admin/sudo - app-admin/syslog-ng - app-arch/mt-st - app-benchmarks/cpuburn -# app-cdr/cdrkit - app-crypt/gnupg -# app-editors/emacs - app-editors/vim - app-misc/livecd-tools - app-misc/mc - app-misc/screen -# app-office/openoffice-bin -# app-office/openoffice - app-portage/gentoolkit - app-portage/mirrorselect - app-portage/ufed - app-text/wgetpaste - dev-util/ccache - dev-vcs/cvs - dev-vcs/git - dev-vcs/subversion - gnome-base/gdm -# gnome-base/gnome - xfce-base/xfce4 - mail-client/thunderbird -# mail-client/thunderbird-bin - media-gfx/fbgrab -# media-sound/audacious - net-analyzer/netcat - net-analyzer/nmap - net-analyzer/tcpdump - net-analyzer/traceroute - net-dialup/mingetty - net-dialup/minicom -### Masked (no keywords) -# net-dialup/penggy - net-dialup/pptpclient - net-dialup/rp-pppoe - net-firewall/iptables - net-fs/cifs-utils - net-fs/nfs-utils - net-im/pidgin - net-irc/irssi - net-irc/xchat - net-misc/bridge-utils - net-misc/dhcpcd - net-misc/iputils - net-misc/ntp - net-misc/rdate - net-misc/rdesktop - net-misc/vconfig - net-misc/vpnc - net-misc/whois - net-p2p/bittorrent - net-proxy/dante - net-proxy/tsocks - net-wireless/b43-fwcutter - net-wireless/wireless-tools - net-wireless/wpa_supplicant -### Masked (no keywords) - sys-apps/ethtool - sys-apps/fxload - sys-apps/hdparm -### Masked (no keywords) -# sys-apps/ibm-powerpc-utils -### Masked (no keywords) -# sys-apps/ibm-powerpc-utils-papr - sys-apps/iproute2 -### Masked (no keywords) -# sys-apps/lssbus - sys-apps/memtester - sys-apps/netplug - sys-block/parted -### Masked (no keywords) -# sys-apps/powerpc-utils - sys-apps/sdparm - sys-apps/sg3_utils - sys-apps/slocate - sys-apps/smartmontools - sys-block/aoetools - sys-block/disktype -### Masked (-amd64) -# sys-block/gpart - sys-block/partimage - sys-block/qla-fc-firmware -### Masked (no keywords) -# sys-boot/aboot -### Masked (no keywords) -# sys-boot/elilo - sys-boot/grub -# sys-boot/lilo - sys-boot/syslinux -### Masked (no keywords) -# sys-boot/yaboot -### Masked (no keywords) -# sys-devel/binutils-hppa64 - sys-devel/distcc -### Masked (no keywords) -# sys-devel/gcc-hppa64 - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware - sys-firmware/zd1201-firmware - sys-firmware/zd1211-firmware - sys-fs/cryptsetup - sys-fs/dmraid - sys-fs/dosfstools - sys-fs/e2fsprogs - sys-fs/hfsplusutils - sys-fs/hfsutils -### Masked (no keywords) -# 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/ntfs3g - sys-fs/reiserfsprogs - sys-fs/xfsprogs - sys-kernel/genkernel - sys-libs/gpm - sys-power/acpid - sys-process/htop - sys-process/vixie-cron - www-client/links - www-client/firefox -# www-client/firefox-bin - x11-base/xorg-server - x11-base/xorg-x11 - x11-drivers/synaptics - x11-themes/gdm-themes-livecd - x11-themes/gentoo-artwork-livecd diff --git a/releases/specs/amd64/livecd-stage2.spec b/releases/specs/amd64/livecd-stage2.spec deleted file mode 100644 index 1c56ae46..00000000 --- a/releases/specs/amd64/livecd-stage2.spec +++ /dev/null @@ -1,65 +0,0 @@ -subarch: amd64 -version_stamp: @TIMESTAMP@ -target: livecd-stage2 -rel_type: default -profile: default/linux/amd64/17.0/desktop -snapshot: @TIMESTAMP@ -source_subpath: default/livecd-stage1-amd64-installer-@TIMESTAMP@ - -livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 -livecd/fsscript: @REPO_DIR@/releases/@TIMESTAMP@/scripts/livecd.sh -livecd/fstype: squashfs -livecd/iso: livecd-amd64-installer-@TIMESTAMP@.iso -livecd/type: gentoo-release-livecd -livecd/volid: Gentoo amd64 LiveCD @TIMESTAMP@ -livecd/xsession: xfce -livecd/xdm: gdm - -livecd/overlay: @REPO_DIR@/releases/@TIMESTAMP@/overlays/common/overlay/livecd -livecd/root_overlay: @REPO_DIR@/releases/@TIMESTAMP@/overlays/common/root_overlay - -boot/kernel: gentoo -boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/@TIMESTAMP@/kconfig/amd64/livecd-2.6.24.config -boot/kernel/gentoo/use: atm png truetype usb -boot/kernel/gentoo/packages: - media-libs/alsa-oss - media-sound/alsa-utils -### Masked (~amd64) -# net-dialup/fcdsl -### Masked (~amd64) -# net-dialup/fritzcapi -### Masked (~amd64) -# net-dialup/slmodem - net-misc/br2684ctl -### Masked (~amd64) -# net-wireless/acx - net-wireless/hostap-utils -# net-wireless/ipw3945 -# net-wireless/madwifi-ng-tools -# net-wireless/rt2500 -### Masked (~amd64) -# net-wireless/rtl8187 - sys-apps/pcmciautils - sys-kernel/linux-firmware - sys-fs/ntfs3g - -livecd/empty: - /var/tmp - /var/empty - /var/run - /var/state - /var/cache/edb/dep - /tmp - /usr/portage - /usr/src - /root/.ccache - /usr/share/genkernel/pkg/x86/cpio - -livecd/rm: - /etc/*- - /etc/*.old - /root/.viminfo - /var/log/*.log - /usr/share/genkernel/pkg/x86/*.bz2 diff --git a/releases/specs/amd64/livedvd-stage1.spec b/releases/specs/amd64/livedvd-stage1.spec deleted file mode 100644 index 3108b607..00000000 --- a/releases/specs/amd64/livedvd-stage1.spec +++ /dev/null @@ -1,285 +0,0 @@ -subarch: amd64 -version_stamp: installer-@TIMESTAMP@ -target: livecd-stage1 -rel_type: default -profile: default/linux/amd64/17.0/desktop -snapshot: @TIMESTAMP@ -source_subpath: default/stage3-amd64-desktop-@TIMESTAMP@ -livecd/use: - branding - livecd - socks5 - -livecd/packages: - app-accessibility/brltty - app-admin/gkrellm - app-admin/hddtemp - app-admin/ide-smart - app-admin/logrotate - app-admin/pwgen - app-admin/quickswitch - app-admin/sudo - app-admin/superadduser - app-admin/syslog-ng -### Masked (~amd64) -# app-admin/testdisk - app-arch/alien - app-arch/mt-st - app-arch/unrar - app-arch/unzip - app-benchmarks/cpuburn - app-cdr/bin2iso - app-cdr/cdrdao - app-cdr/cdrkit - app-cdr/dvd+rw-tools - app-cdr/gnomebaker - app-cdr/k3b - app-cdr/nrg2iso - app-crypt/gnupg - app-editors/bluefish - app-editors/emacs - app-editors/gvim - app-editors/vim - app-editors/xemacs - app-forensics/chkrootkit - app-laptop/i8kutils -### Compile fails -# app-misc/beagle - app-misc/livecd-tools - app-misc/mc - app-misc/pax-utils - app-misc/screen -### Masked (~amd64) -# app-misc/splitvt - app-misc/vlock - app-office/dia - app-office/gnucash - app-office/gnumeric - app-office/koffice - app-office/openoffice -# app-office/openoffice-bin - app-office/scribus - app-pda/gtkpod - app-pda/ipodslave - app-portage/herdstat - app-portage/genlop - app-portage/gentoolkit - app-portage/gentoolkit-dev - app-portage/layman - app-portage/mirrorselect - app-portage/portage-utils - app-portage/ufed - app-shells/bash-completion - app-shells/gentoo-bashcomp - app-shells/tcsh - app-shells/zsh - app-shells/zsh-completion - app-text/tetex - app-text/wgetpaste - dev-util/anjuta - dev-util/ccache - dev-vcs/cvs - dev-vcs/git - dev-util/indent - dev-util/kdbg - dev-vcs/kdesvn - dev-util/kdevelop - dev-util/ltrace - dev-util/strace - dev-vcs/subversion - dev-util/valgrind - gnome-base/gnome - gnome-extra/evolution-exchange - gnome-base/gdm -### Masked (~amd64) -# gnome-extra/gsynaptics - gnome-extra/sensors-applet - kde-base/kde-meta - kde-base/kooka - mail-client/evolution - mail-client/thunderbird - mail-client/thunderbird-bin - mail-client/sylpheed - mail-client/claws-mail -### Masked (~amd64) -# media-gfx/blender - media-gfx/digikam - media-gfx/fbgrab - media-gfx/gimp - media-gfx/gimp-print - media-gfx/gtkam - media-gfx/inkscape - media-gfx/xsane - media-sound/amarok - media-sound/audacious - media-sound/audacity - media-sound/easytag - media-sound/gnomeradio - media-sound/grip - media-sound/hydrogen - media-sound/rhythmbox - media-video/dvdrip - media-video/gqcam -# media-video/gxine - media-video/lsdvd - media-video/mplayer -### Masked (~amd64) -# media-video/mplayer-bin - media-video/ogle-gui - media-video/vlc - media-video/xine-ui - media-video/kmplayer - net-analyzer/ettercap - net-analyzer/netcat - net-analyzer/nmap - net-analyzer/snort - net-analyzer/tcpdump - net-analyzer/traceroute - net-analyzer/wireshark - net-dialup/mingetty - net-dialup/minicom -### Masked (no keyword) -# net-dialup/penggy - net-dialup/pptpclient - net-dialup/rp-pppoe - net-firewall/iptables - net-firewall/kmyfirewall - net-ftp/ncftp - net-fs/cifs-utils - net-fs/nfs-utils - net-fs/samba - net-im/pidgin - net-irc/irssi - net-irc/xchat - net-misc/bridge-utils - net-misc/dhcpcd - net-misc/iputils - net-misc/ntp - net-misc/rdate - net-misc/rdesktop - net-misc/tightvnc - net-misc/vconfig - net-misc/vpnc - net-misc/whois - net-nntp/pan - net-p2p/bittorrent - net-p2p/limewire - net-print/cups - net-proxy/dante - net-proxy/tsocks -### Masked (~amd64) -# net-wireless/aircrack-ng -### Masked (~amd64) -# net-wireless/airsnort - net-wireless/b43-fwcutter - net-wireless/gnome-bluetooth - net-wireless/kdebluetooth - net-wireless/wepattack - net-wireless/wireless-tools - net-wireless/wpa_supplicant - rox-base/rox -### Masked - sys-apps/dmidecode - sys-apps/ethtool - sys-apps/fxload - sys-apps/gradm - sys-apps/hdparm -### Masked (no keyword) -# sys-apps/ibm-powerpc-utils -### Masked (no keyword) -# sys-apps/ibm-powerpc-utils-papr - sys-apps/iproute2 - sys-apps/ivman -### Masked (no keyword) -# sys-apps/lssbus - sys-apps/memtester - sys-apps/netplug - sys-block/parted - sys-apps/pcsc-lite - sys-apps/pmount -### Masked (no keyword) -# sys-apps/powerpc-utils -### Masked (~amd64) -# sys-apps/qtparted -### Compile fails -# sys-apps/rsbac-admin - sys-apps/sdparm - sys-apps/sg3_utils - sys-apps/slocate - sys-apps/smartmontools -### Masked (~amd64) -# sys-apps/tuxonice-userui - sys-block/aoetools - sys-block/disktype -### Masked (-amd64) -# sys-block/gpart - sys-block/gparted - sys-block/mpt-status - sys-block/partimage - sys-block/qla-fc-firmware -### Masked (no keyword) -# sys-boot/aboot -### Masked (no keyword) -# sys-boot/elilo - sys-boot/grub - sys-boot/lilo - sys-boot/syslinux -### Masked (no keyword) -# sys-boot/yaboot -### Masked (no keyword) -# sys-devel/binutils-hppa64 - sys-devel/distcc -### Masked (no keyword) -# sys-devel/gcc-hppa64 - sys-devel/gdb - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware - sys-firmware/zd1201-firmware - sys-firmware/zd1211-firmware - sys-fs/cryptsetup - sys-fs/dmraid - sys-fs/dosfstools - sys-fs/e2fsprogs -### Masked (~amd64) -# sys-fs/hfsplusutils - sys-fs/hfsutils -### Masked (no keyword) -# sys-fs/iprutils - sys-fs/jfsutils - sys-fs/lsscsi - sys-fs/lvm2 - sys-fs/mac-fdisk - sys-fs/mdadm - sys-fs/multipath-tools - sys-fs/ntfs3g - sys-fs/reiserfsprogs - sys-fs/quota - sys-fs/xfsprogs - sys-fs/xfsdump - sys-kernel/genkernel - sys-libs/gpm - sys-power/acpid - sys-power/apcupsd - sys-process/htop - sys-process/lsof - sys-process/vixie-cron - www-client/epiphany-extensions - www-client/galeon - www-client/links - www-client/firefox - www-client/firefox-bin - www-client/opera - www-client/seamonkey - www-client/seamonkey-bin - x11-base/xorg-x11 - x11-drivers/synaptics - x11-misc/xscreensaver -### Masked (no keyword) -# x11-plugins/gkrellm-plugins - x11-themes/gdm-themes-livecd - x11-themes/gentoo-artwork-livecd - x11-wm/afterstep - x11-wm/enlightenment - x11-wm/fluxbox - x11-wm/windowmaker - xfce-base/xfce4 diff --git a/releases/specs/amd64/livedvd-stage2.spec b/releases/specs/amd64/livedvd-stage2.spec deleted file mode 100644 index 187b464c..00000000 --- a/releases/specs/amd64/livedvd-stage2.spec +++ /dev/null @@ -1,65 +0,0 @@ -subarch: amd64 -version_stamp: @TIMESTAMP@ -target: livecd-stage2 -rel_type: default -profile: default/linux/amd64/17.0/desktop -snapshot: @TIMESTAMP@ -source_subpath: default/livecd-stage1-amd64-installer-@TIMESTAMP@ - -livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 -livecd/fsscript: @REPO_DIR@/releases/@TIMESTAMP@/scripts/livecd.sh -livecd/fstype: squashfs -livecd/iso: livedvd-amd64-installer-@TIMESTAMP@.iso -livecd/type: gentoo-release-livecd -livecd/volid: Gentoo amd64 LiveDVD @TIMESTAMP@ -livecd/xdm: gdm -livecd/xsession: xfce - -livecd/overlay: @REPO_DIR@/releases/@TIMESTAMP@/overlays/common/overlay/livedvd -livecd/root_overlay: @REPO_DIR@/releases/@TIMESTAMP@/overlays/common/root_overlay - -boot/kernel: gentoo - -boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/@TIMESTAMP@/kconfig/amd64/livecd-2.6.24.config -boot/kernel/gentoo/use: atm png truetype usb -boot/kernel/gentoo/packages: - media-libs/alsa-oss - media-sound/alsa-utils -### Masked (no keyword) -# net-dialup/fcdsl -### Masked (~amd64) -# net-dialup/fritzcapi -### Masked (~amd64) -# net-dialup/slmodem - net-misc/br2684ctl -### Masked (~amd64) -# net-wireless/acx - net-wireless/hostap-utils -# net-wireless/ipw3945 -# net-wireless/madwifi-ng-tools -# net-wireless/rt2500 -### Masked (~amd64) -# net-wireless/rtl8187 - sys-apps/pcmciautils - sys-kernel/linux-firmware - -livecd/empty: - /var/tmp - /var/empty - /var/run - /var/state - /var/cache/edb/dep - /tmp - /usr/portage - /usr/src - /root/.ccache - /usr/share/genkernel/pkg/amd64/cpio - -livecd/rm: - /etc/*- - /etc/*.old - /root/.viminfo - /var/log/*.log - /usr/share/genkernel/pkg/amd64/*.bz2 diff --git a/releases/specs/amd64/stage1.spec b/releases/specs/amd64/stage1-openrc.spec similarity index 76% rename from releases/specs/amd64/stage1.spec rename to releases/specs/amd64/stage1-openrc.spec index 80f599ef..1b2f4f59 100644 --- a/releases/specs/amd64/stage1.spec +++ b/releases/specs/amd64/stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: amd64 target: stage1 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1 snapshot: @TIMESTAMP@ -source_subpath: default/stage3-amd64-latest +source_subpath: default/stage3-amd64-openrc-latest compression_mode: pixz_x update_seed: yes update_seed_command: --update --deep --newuse @world diff --git a/releases/specs/amd64/stage2-desktop.spec b/releases/specs/amd64/stage2-desktop.spec deleted file mode 100644 index 856bce02..00000000 --- a/releases/specs/amd64/stage2-desktop.spec +++ /dev/null @@ -1,8 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: desktop-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.0/desktop -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-amd64-@TIMESTAMP@ -portage_prefix: releng diff --git a/releases/specs/amd64/stage2.spec b/releases/specs/amd64/stage2-openrc.spec similarity index 69% rename from releases/specs/amd64/stage2.spec rename to releases/specs/amd64/stage2-openrc.spec index 8b4186cb..b0191f9b 100644 --- a/releases/specs/amd64/stage2.spec +++ b/releases/specs/amd64/stage2-openrc.spec @@ -1,10 +1,10 @@ subarch: amd64 target: stage2 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1 snapshot: @TIMESTAMP@ -source_subpath: default/stage1-amd64-@TIMESTAMP@ +source_subpath: default/stage1-amd64-openrc-@TIMESTAMP@ compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage3-desktop.spec b/releases/specs/amd64/stage3-desktop.spec deleted file mode 100644 index 306103a9..00000000 --- a/releases/specs/amd64/stage3-desktop.spec +++ /dev/null @@ -1,8 +0,0 @@ -subarch: amd64 -target: stage3 -version_stamp: desktop-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.0/desktop -snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-desktop-@TIMESTAMP@ -portage_prefix: releng diff --git a/releases/specs/amd64/stage3.spec b/releases/specs/amd64/stage3-openrc.spec similarity index 69% rename from releases/specs/amd64/stage3.spec rename to releases/specs/amd64/stage3-openrc.spec index cf3e1d72..7ab0d079 100644 --- a/releases/specs/amd64/stage3.spec +++ b/releases/specs/amd64/stage3-openrc.spec @@ -1,10 +1,10 @@ subarch: amd64 target: stage3 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1 snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-@TIMESTAMP@ +source_subpath: default/stage2-amd64-openrc-@TIMESTAMP@ compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage4-minimal.spec b/releases/specs/amd64/stage4-minimal.spec deleted file mode 100644 index 3f70de53..00000000 --- a/releases/specs/amd64/stage4-minimal.spec +++ /dev/null @@ -1,70 +0,0 @@ -subarch: amd64 -target: stage4 -version_stamp: minimal-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.1 -snapshot: @TIMESTAMP@ -compression_mode: pixz_x -source_subpath: default/stage3-amd64-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/isos - -stage4/use: - bindist - bzip2 - idm - ipv6 - urandom - -stage4/packages: - net-misc/dhcp - net-misc/iputils - sys-boot/grub - sys-apps/gptfdisk - sys-apps/iproute2 - sys-devel/bc - sys-power/acpid - app-crypt/gentoo-keys -stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh -stage4/rcadd: - acpid|default - net.lo|default - netmount|default - sshd|default - -boot/kernel: gentoo -boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config -boot/kernel/gentoo/extraversion: openstack -boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules - -# all of the cleanup... -stage4/unmerge: - sys-devel/bc - sys-kernel/genkernel - sys-kernel/gentoo-sources - -stage4/empty: - /root/.ccache - /tmp - /usr/portage/distfiles - /usr/src - /var/cache/edb/dep - /var/cache/genkernel - /var/cache/portage/distfiles - /var/empty - /var/run - /var/state - /var/tmp - -stage4/rm: - /etc/*- - /etc/*.old - /etc/ssh/ssh_host_* - /root/.*history - /root/.lesshst - /root/.ssh/known_hosts - /root/.viminfo - # Remove any generated stuff by genkernel - /usr/share/genkernel - # This is 3MB of crap for each copy - /usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz diff --git a/releases/specs/amd64/stage4-nomultilib-minimal.spec b/releases/specs/amd64/stage4-nomultilib-minimal.spec deleted file mode 100644 index d01c6fbe..00000000 --- a/releases/specs/amd64/stage4-nomultilib-minimal.spec +++ /dev/null @@ -1,70 +0,0 @@ -subarch: amd64 -target: stage4 -version_stamp: minimal-nomultilib-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.1/no-multilib -snapshot: @TIMESTAMP@ -compression_mode: pixz_x -source_subpath: default/stage3-amd64-nomultilib-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/isos - -stage4/use: - bindist - bzip2 - idm - ipv6 - urandom - -stage4/packages: - net-misc/dhcp - net-misc/iputils - sys-boot/grub - sys-apps/gptfdisk - sys-apps/iproute2 - sys-devel/bc - sys-power/acpid - app-crypt/gentoo-keys -stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh -stage4/rcadd: - acpid|default - net.lo|default - netmount|default - sshd|default - -boot/kernel: gentoo -boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config -boot/kernel/gentoo/extraversion: openstack -boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules - -# all of the cleanup... -stage4/unmerge: - sys-devel/bc - sys-kernel/genkernel - sys-kernel/gentoo-sources - -stage4/empty: - /root/.ccache - /tmp - /usr/portage/distfiles - /usr/src - /var/cache/edb/dep - /var/cache/genkernel - /var/cache/portage/distfiles - /var/empty - /var/run - /var/state - /var/tmp - -stage4/rm: - /etc/*- - /etc/*.old - /etc/ssh/ssh_host_* - /root/.*history - /root/.lesshst - /root/.ssh/known_hosts - /root/.viminfo - # Remove any generated stuff by genkernel - /usr/share/genkernel - # This is 3MB of crap for each copy - /usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf index fc3bbe49..c22c95cb 100644 --- a/tools/catalyst-auto-amd64-demeter.conf +++ b/tools/catalyst-auto-amd64-demeter.conf @@ -13,6 +13,8 @@ EMAIL_SUBJECT_PREPEND="[amd64-auto]" SPECS_DIR=${REPO_DIR}/releases/specs/amd64 SETS=" + openrc + systemd hardened_openrc hardened_nomultilib_openrc nomultilib_openrc @@ -22,6 +24,10 @@ SETS=" x32_openrc " +SET_openrc_SPECS="stage1-openrc.spec stage2-openrc.spec stage3-openrc.spec" +SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" +SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" + SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec" SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" @@ -68,6 +74,15 @@ post_build() { pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit case ${spec} in + stage3-openrc.spec) + upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz* + ;; + stage3-systemd.spec) + upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz* + ;; + installcd-stage2-minimal.spec) + upload install-amd64-minimal-${TIMESTAMP}.iso* + ;; nomultilib/stage3-openrc.spec) upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz* ;; diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 261db285..ee756ba8 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -12,17 +12,9 @@ source /etc/catalyst/release/build.env SPECS_DIR=${REPO_DIR}/releases/specs/amd64 SETS=" - multilib minimal_multilib - systemd hardened_multilib_selinux hardened_nomultilib_selinux " -SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" -SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -#SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec" - -SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" - SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" #SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec" SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec" @@ -56,24 +48,6 @@ update_symlinks() { post_build() { local set=$1 spec=$2 - pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit - UPLOAD_DEST=${BUILD_DESTDIR_BASE} - case ${spec} in - stage3.spec) - upload stage3-amd64-${TIMESTAMP}.tar.xz* - ;; - installcd-stage2-minimal.spec) - upload install-amd64-minimal-${TIMESTAMP}.iso* - ;; - stage4-minimal.spec) - upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz* - ;; - stage3-systemd.spec) - upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz* - ;; - esac - popd >/dev/null || exit - pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened case ${spec} in