diff --git a/releases/weekly/specs/amd64/stage1-systemd.spec b/releases/weekly/specs/amd64/stage1-systemd.spec deleted file mode 100644 index 0addbbec..00000000 --- a/releases/weekly/specs/amd64/stage1-systemd.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: amd64 -target: stage1 -version_stamp: latest -rel_type: default -profile: default/linux/amd64/17.0/systemd -snapshot: latest -source_subpath: default/stage3-amd64-latest -update_seed: yes -update_seed_command: --update --deep @world -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages -portage_prefix: releng diff --git a/releases/weekly/specs/amd64/stage2-systemd.spec b/releases/weekly/specs/amd64/stage2-systemd.spec deleted file mode 100644 index 8a2456c8..00000000 --- a/releases/weekly/specs/amd64/stage2-systemd.spec +++ /dev/null @@ -1,9 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: latest -rel_type: default -profile: default/linux/amd64/17.0/systemd -snapshot: latest -source_subpath: default/stage1-amd64-systemd-latest -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages -portage_prefix: releng diff --git a/releases/weekly/specs/amd64/stage3-systemd.spec b/releases/weekly/specs/amd64/stage3-systemd.spec deleted file mode 100644 index dcf2b0c0..00000000 --- a/releases/weekly/specs/amd64/stage3-systemd.spec +++ /dev/null @@ -1,9 +0,0 @@ -subarch: amd64 -target: stage3 -version_stamp: latest -rel_type: default -profile: default/linux/amd64/17.0/systemd -snapshot: latest -source_subpath: default/stage2-amd64-systemd-latest -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages -portage_prefix: releng diff --git a/releases/weekly/specs/amd64/stage4-systemd.spec b/releases/weekly/specs/amd64/stage4-systemd.spec deleted file mode 100644 index 236ae02b..00000000 --- a/releases/weekly/specs/amd64/stage4-systemd.spec +++ /dev/null @@ -1,73 +0,0 @@ -subarch: amd64 -target: stage4 -version_stamp: systemd-latest -rel_type: default -profile: default/linux/amd64/17.0/systemd -snapshot: latest -source_subpath: default/stage3-amd64-systemd-latest -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages/ - -stage4/use: - bash-completion - bindist - bzip2 - idm - ipv6 - mmx - sse - sse2 - urandom - -stage4/packages: - app-admin/sudo - net-misc/dhcp - net-misc/iputils - sys-boot/grub - sys-apps/gptfdisk - sys-apps/iproute2 - sys-apps/lsb-release - sys-devel/bc - sys-power/acpid -stage4/fsscript: @REPO_DIR@/releases/weekly/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/weekly/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-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.conf b/tools/catalyst-auto-amd64.conf index e469a487..890a1cc6 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -17,7 +17,6 @@ SETS=" hardened_nomultilib minimal_hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux " -# systemd SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" @@ -27,8 +26,6 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec" SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" -#SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" -SET_systemd_OPTIONAL_SPECS="stage4-systemd.spec" SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"