| 1 |
commit: 29419b20d21bf7a68fa1c027db77fa5126fbb9f6 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 16 02:58:22 2015 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 16 02:58:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=29419b20 |
| 7 |
|
| 8 |
Add stage4 for Matthew's cloud images - https://github.com/prometheanfire/gentoo-cloud-prep/ . |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
.../specs/amd64/hardened/stage4-nomultilib.spec | 60 ++++++++++++++++++++++ |
| 13 |
releases/weekly/specs/amd64/hardened/stage4.spec | 60 ++++++++++++++++++++++ |
| 14 |
releases/weekly/specs/amd64/stage4-nomultilib.spec | 60 ++++++++++++++++++++++ |
| 15 |
releases/weekly/specs/amd64/stage4.spec | 60 ++++++++++++++++++++++ |
| 16 |
tools/catalyst-auto-amd64.conf | 8 +-- |
| 17 |
5 files changed, 244 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..a62f07b |
| 22 |
--- /dev/null |
| 23 |
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec |
| 24 |
@@ -0,0 +1,60 @@ |
| 25 |
+subarch: amd64 |
| 26 |
+target: stage4 |
| 27 |
+version_stamp: hardened+cloud-nomultilib-2008.0 |
| 28 |
+rel_type: hardened |
| 29 |
+profile: hardened/linux/amd64/no-multilib |
| 30 |
+snapshot: 2008.0 |
| 31 |
+source_subpath: hardened/stage3-amd64-hardened+cloud-nomultilib-2008.0 |
| 32 |
+portage_confdir: /release/releng/releases/weekly/portage/stages |
| 33 |
+ |
| 34 |
+stage4/use: |
| 35 |
+ abi_x86_32 |
| 36 |
+ abi_x86_64 |
| 37 |
+ bash-completion |
| 38 |
+ bzip2 |
| 39 |
+ idm |
| 40 |
+ ipv6 |
| 41 |
+ mmx |
| 42 |
+ sse |
| 43 |
+ sse2 |
| 44 |
+ urandom |
| 45 |
+ |
| 46 |
+stage4/packages: |
| 47 |
+ app-admin/logrotate |
| 48 |
+ app-admin/sudo |
| 49 |
+ app-admin/syslog-ng |
| 50 |
+ app-editors/vim |
| 51 |
+ app-emulation/cloud-init |
| 52 |
+ app-portage/eix |
| 53 |
+ app-portage/gentoolkit |
| 54 |
+ net-misc/dhcpcd |
| 55 |
+ sys-boot/grub |
| 56 |
+ sys-apps/dmidecode |
| 57 |
+ sys-apps/gptfdisk |
| 58 |
+ sys-apps/iproute2 |
| 59 |
+ sys-apps/lsb-release |
| 60 |
+ sys-apps/pciutils |
| 61 |
+ sys-block/parted |
| 62 |
+ sys-devel/bc |
| 63 |
+ sys-power/acpid |
| 64 |
+ sys-process/cronie |
| 65 |
+stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh |
| 66 |
+stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay |
| 67 |
+stage4/rcadd: |
| 68 |
+ acpid|default |
| 69 |
+ cloud-config|default |
| 70 |
+ cloud-final|default |
| 71 |
+ cloud-init-local|default |
| 72 |
+ cloud-init|default |
| 73 |
+ cronie|default |
| 74 |
+ dhcpcd|default |
| 75 |
+ net.lo|default |
| 76 |
+ netmount|default |
| 77 |
+ sshd|default |
| 78 |
+ syslog-ng|default |
| 79 |
+ |
| 80 |
+boot/kernel: gentoo |
| 81 |
+boot/kernel/gentoo/sources: gentoo-sources |
| 82 |
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config |
| 83 |
+boot/kernel/gentoo/extraversion: openstack |
| 84 |
+boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 85 |
|
| 86 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4.spec b/releases/weekly/specs/amd64/hardened/stage4.spec |
| 87 |
new file mode 100644 |
| 88 |
index 0000000..88eaeaa |
| 89 |
--- /dev/null |
| 90 |
+++ b/releases/weekly/specs/amd64/hardened/stage4.spec |
| 91 |
@@ -0,0 +1,60 @@ |
| 92 |
+subarch: amd64 |
| 93 |
+target: stage4 |
| 94 |
+version_stamp: hardened+cloud-2008.0 |
| 95 |
+rel_type: hardened |
| 96 |
+profile: hardened/linux/amd64 |
| 97 |
+snapshot: 2008.0 |
| 98 |
+source_subpath: hardened/stage3-amd64-cloud-hardened-2008.0 |
| 99 |
+portage_confdir: /release/releng/releases/weekly/portage/stages |
| 100 |
+ |
| 101 |
+stage4/use: |
| 102 |
+ abi_x86_32 |
| 103 |
+ abi_x86_64 |
| 104 |
+ bash-completion |
| 105 |
+ bzip2 |
| 106 |
+ idm |
| 107 |
+ ipv6 |
| 108 |
+ mmx |
| 109 |
+ sse |
| 110 |
+ sse2 |
| 111 |
+ urandom |
| 112 |
+ |
| 113 |
+stage4/packages: |
| 114 |
+ app-admin/logrotate |
| 115 |
+ app-admin/sudo |
| 116 |
+ app-admin/syslog-ng |
| 117 |
+ app-editors/vim |
| 118 |
+ app-emulation/cloud-init |
| 119 |
+ app-portage/eix |
| 120 |
+ app-portage/gentoolkit |
| 121 |
+ net-misc/dhcpcd |
| 122 |
+ sys-boot/grub |
| 123 |
+ sys-apps/dmidecode |
| 124 |
+ sys-apps/gptfdisk |
| 125 |
+ sys-apps/iproute2 |
| 126 |
+ sys-apps/lsb-release |
| 127 |
+ sys-apps/pciutils |
| 128 |
+ sys-block/parted |
| 129 |
+ sys-devel/bc |
| 130 |
+ sys-power/acpid |
| 131 |
+ sys-process/cronie |
| 132 |
+stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh |
| 133 |
+stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay |
| 134 |
+stage4/rcadd: |
| 135 |
+ acpid|default |
| 136 |
+ cloud-config|default |
| 137 |
+ cloud-final|default |
| 138 |
+ cloud-init-local|default |
| 139 |
+ cloud-init|default |
| 140 |
+ cronie|default |
| 141 |
+ dhcpcd|default |
| 142 |
+ net.lo|default |
| 143 |
+ netmount|default |
| 144 |
+ sshd|default |
| 145 |
+ syslog-ng|default |
| 146 |
+ |
| 147 |
+boot/kernel: gentoo |
| 148 |
+boot/kernel/gentoo/sources: gentoo-sources |
| 149 |
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config |
| 150 |
+boot/kernel/gentoo/extraversion: openstack |
| 151 |
+boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 152 |
|
| 153 |
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib.spec b/releases/weekly/specs/amd64/stage4-nomultilib.spec |
| 154 |
new file mode 100644 |
| 155 |
index 0000000..a467c51 |
| 156 |
--- /dev/null |
| 157 |
+++ b/releases/weekly/specs/amd64/stage4-nomultilib.spec |
| 158 |
@@ -0,0 +1,60 @@ |
| 159 |
+subarch: amd64 |
| 160 |
+target: stage4 |
| 161 |
+version_stamp: cloud-nomultilib-2008.0 |
| 162 |
+rel_type: default |
| 163 |
+profile: default/linux/amd64/13.0/no-multilib |
| 164 |
+snapshot: 2008.0 |
| 165 |
+source_subpath: default/stage3-amd64-cloud-nomultilib-2008.0 |
| 166 |
+portage_confdir: /release/releng/releases/weekly/portage/stages |
| 167 |
+ |
| 168 |
+stage4/use: |
| 169 |
+ abi_x86_32 |
| 170 |
+ abi_x86_64 |
| 171 |
+ bash-completion |
| 172 |
+ bzip2 |
| 173 |
+ idm |
| 174 |
+ ipv6 |
| 175 |
+ mmx |
| 176 |
+ sse |
| 177 |
+ sse2 |
| 178 |
+ urandom |
| 179 |
+ |
| 180 |
+stage4/packages: |
| 181 |
+ app-admin/logrotate |
| 182 |
+ app-admin/sudo |
| 183 |
+ app-admin/syslog-ng |
| 184 |
+ app-editors/vim |
| 185 |
+ app-emulation/cloud-init |
| 186 |
+ app-portage/eix |
| 187 |
+ app-portage/gentoolkit |
| 188 |
+ net-misc/dhcpcd |
| 189 |
+ sys-boot/grub |
| 190 |
+ sys-apps/dmidecode |
| 191 |
+ sys-apps/gptfdisk |
| 192 |
+ sys-apps/iproute2 |
| 193 |
+ sys-apps/lsb-release |
| 194 |
+ sys-apps/pciutils |
| 195 |
+ sys-block/parted |
| 196 |
+ sys-devel/bc |
| 197 |
+ sys-power/acpid |
| 198 |
+ sys-process/cronie |
| 199 |
+stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh |
| 200 |
+stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay |
| 201 |
+stage4/rcadd: |
| 202 |
+ acpid|default |
| 203 |
+ cloud-config|default |
| 204 |
+ cloud-final|default |
| 205 |
+ cloud-init-local|default |
| 206 |
+ cloud-init|default |
| 207 |
+ cronie|default |
| 208 |
+ dhcpcd|default |
| 209 |
+ net.lo|default |
| 210 |
+ netmount|default |
| 211 |
+ sshd|default |
| 212 |
+ syslog-ng|default |
| 213 |
+ |
| 214 |
+boot/kernel: gentoo |
| 215 |
+boot/kernel/gentoo/sources: gentoo-sources |
| 216 |
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config |
| 217 |
+boot/kernel/gentoo/extraversion: openstack |
| 218 |
+boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 219 |
|
| 220 |
diff --git a/releases/weekly/specs/amd64/stage4.spec b/releases/weekly/specs/amd64/stage4.spec |
| 221 |
new file mode 100644 |
| 222 |
index 0000000..b381da6 |
| 223 |
--- /dev/null |
| 224 |
+++ b/releases/weekly/specs/amd64/stage4.spec |
| 225 |
@@ -0,0 +1,60 @@ |
| 226 |
+subarch: amd64 |
| 227 |
+target: stage4 |
| 228 |
+version_stamp: cloud-2008.0 |
| 229 |
+rel_type: default |
| 230 |
+profile: default/linux/amd64/13.0 |
| 231 |
+snapshot: 2008.0 |
| 232 |
+source_subpath: default/stage3-amd64-cloud-2008.0 |
| 233 |
+portage_confdir: /release/releng/releases/weekly/portage/stages |
| 234 |
+ |
| 235 |
+stage4/use: |
| 236 |
+ abi_x86_32 |
| 237 |
+ abi_x86_64 |
| 238 |
+ bash-completion |
| 239 |
+ bzip2 |
| 240 |
+ idm |
| 241 |
+ ipv6 |
| 242 |
+ mmx |
| 243 |
+ sse |
| 244 |
+ sse2 |
| 245 |
+ urandom |
| 246 |
+ |
| 247 |
+stage4/packages: |
| 248 |
+ app-admin/logrotate |
| 249 |
+ app-admin/sudo |
| 250 |
+ app-admin/syslog-ng |
| 251 |
+ app-editors/vim |
| 252 |
+ app-emulation/cloud-init |
| 253 |
+ app-portage/eix |
| 254 |
+ app-portage/gentoolkit |
| 255 |
+ net-misc/dhcpcd |
| 256 |
+ sys-boot/grub |
| 257 |
+ sys-apps/dmidecode |
| 258 |
+ sys-apps/gptfdisk |
| 259 |
+ sys-apps/iproute2 |
| 260 |
+ sys-apps/lsb-release |
| 261 |
+ sys-apps/pciutils |
| 262 |
+ sys-block/parted |
| 263 |
+ sys-devel/bc |
| 264 |
+ sys-power/acpid |
| 265 |
+ sys-process/cronie |
| 266 |
+stage4/fsscript: /release/releng/releases/weekly/scripts/prep.sh |
| 267 |
+stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay |
| 268 |
+stage4/rcadd: |
| 269 |
+ acpid|default |
| 270 |
+ cloud-config|default |
| 271 |
+ cloud-final|default |
| 272 |
+ cloud-init-local|default |
| 273 |
+ cloud-init|default |
| 274 |
+ cronie|default |
| 275 |
+ dhcpcd|default |
| 276 |
+ net.lo|default |
| 277 |
+ netmount|default |
| 278 |
+ sshd|default |
| 279 |
+ syslog-ng|default |
| 280 |
+ |
| 281 |
+boot/kernel: gentoo |
| 282 |
+boot/kernel/gentoo/sources: gentoo-sources |
| 283 |
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config |
| 284 |
+boot/kernel/gentoo/extraversion: openstack |
| 285 |
+boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 286 |
|
| 287 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
| 288 |
index 8d1a079..a605ddf 100644 |
| 289 |
--- a/tools/catalyst-auto-amd64.conf |
| 290 |
+++ b/tools/catalyst-auto-amd64.conf |
| 291 |
@@ -12,15 +12,15 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} |
| 292 |
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" |
| 293 |
SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib" |
| 294 |
|
| 295 |
-SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" |
| 296 |
+SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec stage4.spec" |
| 297 |
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 298 |
-SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" |
| 299 |
+SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec stage4-nomultilib.spec" |
| 300 |
|
| 301 |
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
| 302 |
|
| 303 |
-SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 304 |
+SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec hardened/stage4.spec" |
| 305 |
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 306 |
-SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
| 307 |
+SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec hardened/stage4-nomultilib.spec" |
| 308 |
|
| 309 |
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" |
| 310 |
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec" |
Archives