From f631c57a16c8aab007ab167747aadf49c3ff954b Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Thu, 17 Dec 2015 20:24:35 -0600 Subject: [PATCH] add portage_confdir for stage4-cloud specs --- releases/weekly/portage/cloud-stages/package.keywords/cloud | 2 ++ releases/weekly/portage/cloud-stages/package.use/grub | 1 + releases/weekly/specs/amd64/hardened/stage4-cloud.spec | 2 +- .../weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec | 2 +- releases/weekly/specs/amd64/stage4-cloud.spec | 2 +- releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 releases/weekly/portage/cloud-stages/package.keywords/cloud create mode 100644 releases/weekly/portage/cloud-stages/package.use/grub diff --git a/releases/weekly/portage/cloud-stages/package.keywords/cloud b/releases/weekly/portage/cloud-stages/package.keywords/cloud new file mode 100644 index 00000000..945477ac --- /dev/null +++ b/releases/weekly/portage/cloud-stages/package.keywords/cloud @@ -0,0 +1,2 @@ +=app-emulation/cloud-init-0.7.6-r1 ~amd64 +=net-misc/dhcpcd-6.9.3 ~amd64 diff --git a/releases/weekly/portage/cloud-stages/package.use/grub b/releases/weekly/portage/cloud-stages/package.use/grub new file mode 100644 index 00000000..4b84ae65 --- /dev/null +++ b/releases/weekly/portage/cloud-stages/package.use/grub @@ -0,0 +1 @@ +sys-boot/grub grub_platforms_pc diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec index 136b5111..c13b035f 100644 --- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec +++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec @@ -5,7 +5,7 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: 2008.0 source_subpath: hardened/stage3-amd64-hardened-2008.0 -portage_confdir: /release/releng/releases/weekly/portage/stages +portage_confdir: /release/releng/releases/weekly/portage/cloud-stages stage4/use: bash-completion diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec index 6f1bcfb3..3f3fc8df 100644 --- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec +++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec @@ -5,7 +5,7 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib snapshot: 2008.0 source_subpath: hardened/stage3-amd64-hardened+nomultilib-2008.0 -portage_confdir: /release/releng/releases/weekly/portage/stages +portage_confdir: /release/releng/releases/weekly/portage/cloud-stages stage4/use: bash-completion diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec index aa8a3ff5..12e245b5 100644 --- a/releases/weekly/specs/amd64/stage4-cloud.spec +++ b/releases/weekly/specs/amd64/stage4-cloud.spec @@ -5,7 +5,7 @@ rel_type: default profile: default/linux/amd64/13.0 snapshot: 2008.0 source_subpath: default/stage3-amd64-2008.0 -portage_confdir: /release/releng/releases/weekly/portage/stages +portage_confdir: /release/releng/releases/weekly/portage/cloud-stages stage4/use: bash-completion diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec index c1b9c1d9..e48c3b9a 100644 --- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec +++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec @@ -5,7 +5,7 @@ rel_type: default profile: default/linux/amd64/13.0/no-multilib snapshot: 2008.0 source_subpath: default/stage3-amd64-nomultilib-2008.0 -portage_confdir: /release/releng/releases/weekly/portage/stages +portage_confdir: /release/releng/releases/weekly/portage/cloud-stages stage4/use: bash-completion