commit: 29419b20d21bf7a68fa1c027db77fa5126fbb9f6 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Wed Dec 16 02:58:22 2015 +0000 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> CommitDate: Wed Dec 16 02:58:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=29419b20
Add stage4 for Matthew's cloud images - https://github.com/prometheanfire/gentoo-cloud-prep/ . Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> .../specs/amd64/hardened/stage4-nomultilib.spec | 60 ++++++++++++++++++++++ releases/weekly/specs/amd64/hardened/stage4.spec | 60 ++++++++++++++++++++++ releases/weekly/specs/amd64/stage4-nomultilib.spec | 60 ++++++++++++++++++++++ releases/weekly/specs/amd64/stage4.spec | 60 ++++++++++++++++++++++ tools/catalyst-auto-amd64.conf | 8 +-- 5 files changed, 244 insertions(+), 4 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec new file mode 100644 index 0000000..a62f07b --- /dev/null +++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec @@ -0,0 +1,60 @@ +subarch: amd64 +target: stage4 +version_stamp: hardened+cloud-nomultilib-2008.0 +rel_type: hardened +profile: hardened/linux/amd64/no-multilib +snapshot: 2008.0 +source_subpath: hardened/stage3-amd64-hardened+cloud-nomultilib-2008.0 +portage_confdir: /release/releng/releases/weekly/portage/stages + +stage4/use: + abi_x86_32 + abi_x86_64 + bash-completion + bzip2 + idm + ipv6 + mmx + sse + sse2 + urandom + +stage4/packages: + app-admin/logrotate + app-admin/sudo + app-admin/syslog-ng + app-editors/vim + app-emulation/cloud-init + app-portage/eix + app-portage/gentoolkit + net-misc/dhcpcd + sys-boot/grub + sys-apps/dmidecode + sys-apps/gptfdisk + sys-apps/iproute2 + sys-apps/lsb-release + sys-apps/pciutils + sys-block/parted + sys-devel/bc + sys-power/acpid + sys-process/cronie +stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh +stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay +stage4/rcadd: + acpid|default + cloud-config|default + cloud-final|default + cloud-init-local|default + cloud-init|default + cronie|default + dhcpcd|default + net.lo|default + netmount|default + sshd|default + syslog-ng|default + +boot/kernel: gentoo +boot/kernel/gentoo/sources: gentoo-sources +boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config +boot/kernel/gentoo/extraversion: openstack +boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules diff --git a/releases/weekly/specs/amd64/hardened/stage4.spec b/releases/weekly/specs/amd64/hardened/stage4.spec new file mode 100644 index 0000000..88eaeaa --- /dev/null +++ b/releases/weekly/specs/amd64/hardened/stage4.spec @@ -0,0 +1,60 @@ +subarch: amd64 +target: stage4 +version_stamp: hardened+cloud-2008.0 +rel_type: hardened +profile: hardened/linux/amd64 +snapshot: 2008.0 +source_subpath: hardened/stage3-amd64-cloud-hardened-2008.0 +portage_confdir: /release/releng/releases/weekly/portage/stages + +stage4/use: + abi_x86_32 + abi_x86_64 + bash-completion + bzip2 + idm + ipv6 + mmx + sse + sse2 + urandom + +stage4/packages: + app-admin/logrotate + app-admin/sudo + app-admin/syslog-ng + app-editors/vim + app-emulation/cloud-init + app-portage/eix + app-portage/gentoolkit + net-misc/dhcpcd + sys-boot/grub + sys-apps/dmidecode + sys-apps/gptfdisk + sys-apps/iproute2 + sys-apps/lsb-release + sys-apps/pciutils + sys-block/parted + sys-devel/bc + sys-power/acpid + sys-process/cronie +stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh +stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay +stage4/rcadd: + acpid|default + cloud-config|default + cloud-final|default + cloud-init-local|default + cloud-init|default + cronie|default + dhcpcd|default + net.lo|default + netmount|default + sshd|default + syslog-ng|default + +boot/kernel: gentoo +boot/kernel/gentoo/sources: gentoo-sources +boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config +boot/kernel/gentoo/extraversion: openstack +boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules diff --git a/releases/weekly/specs/amd64/stage4-nomultilib.spec b/releases/weekly/specs/amd64/stage4-nomultilib.spec new file mode 100644 index 0000000..a467c51 --- /dev/null +++ b/releases/weekly/specs/amd64/stage4-nomultilib.spec @@ -0,0 +1,60 @@ +subarch: amd64 +target: stage4 +version_stamp: cloud-nomultilib-2008.0 +rel_type: default +profile: default/linux/amd64/13.0/no-multilib +snapshot: 2008.0 +source_subpath: default/stage3-amd64-cloud-nomultilib-2008.0 +portage_confdir: /release/releng/releases/weekly/portage/stages + +stage4/use: + abi_x86_32 + abi_x86_64 + bash-completion + bzip2 + idm + ipv6 + mmx + sse + sse2 + urandom + +stage4/packages: + app-admin/logrotate + app-admin/sudo + app-admin/syslog-ng + app-editors/vim + app-emulation/cloud-init + app-portage/eix + app-portage/gentoolkit + net-misc/dhcpcd + sys-boot/grub + sys-apps/dmidecode + sys-apps/gptfdisk + sys-apps/iproute2 + sys-apps/lsb-release + sys-apps/pciutils + sys-block/parted + sys-devel/bc + sys-power/acpid + sys-process/cronie +stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh +stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay +stage4/rcadd: + acpid|default + cloud-config|default + cloud-final|default + cloud-init-local|default + cloud-init|default + cronie|default + dhcpcd|default + net.lo|default + netmount|default + sshd|default + syslog-ng|default + +boot/kernel: gentoo +boot/kernel/gentoo/sources: gentoo-sources +boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config +boot/kernel/gentoo/extraversion: openstack +boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules diff --git a/releases/weekly/specs/amd64/stage4.spec b/releases/weekly/specs/amd64/stage4.spec new file mode 100644 index 0000000..b381da6 --- /dev/null +++ b/releases/weekly/specs/amd64/stage4.spec @@ -0,0 +1,60 @@ +subarch: amd64 +target: stage4 +version_stamp: cloud-2008.0 +rel_type: default +profile: default/linux/amd64/13.0 +snapshot: 2008.0 +source_subpath: default/stage3-amd64-cloud-2008.0 +portage_confdir: /release/releng/releases/weekly/portage/stages + +stage4/use: + abi_x86_32 + abi_x86_64 + bash-completion + bzip2 + idm + ipv6 + mmx + sse + sse2 + urandom + +stage4/packages: + app-admin/logrotate + app-admin/sudo + app-admin/syslog-ng + app-editors/vim + app-emulation/cloud-init + app-portage/eix + app-portage/gentoolkit + net-misc/dhcpcd + sys-boot/grub + sys-apps/dmidecode + sys-apps/gptfdisk + sys-apps/iproute2 + sys-apps/lsb-release + sys-apps/pciutils + sys-block/parted + sys-devel/bc + sys-power/acpid + sys-process/cronie +stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh +stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay +stage4/rcadd: + acpid|default + cloud-config|default + cloud-final|default + cloud-init-local|default + cloud-init|default + cronie|default + dhcpcd|default + net.lo|default + netmount|default + sshd|default + syslog-ng|default + +boot/kernel: gentoo +boot/kernel/gentoo/sources: gentoo-sources +boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config +boot/kernel/gentoo/extraversion: openstack +boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 8d1a079..a605ddf 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -12,15 +12,15 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} #SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib" -SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" +SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec stage4.spec" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" +SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec stage4-nomultilib.spec" SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" -SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" +SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec hardened/stage4.spec" SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" -SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" +SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec hardened/stage4-nomultilib.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"
