From fd08f00578af7456b97e641744a71c402e4b1203 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Mon, 22 Sep 2014 20:41:40 -0400 Subject: [PATCH] Propagate $PVR to the oem-*/files/cloud-config.yml files as version-id --- .../coreos-base/oem-azure/files/cloud-config.yml | 1 + .../{oem-azure-0.0.1.ebuild => oem-azure-0.0.1-r1.ebuild} | 7 ++++++- .../coreos-base/oem-cloudstack/files/cloud-config.yml | 1 + ...tack-0.0.1-r2.ebuild => oem-cloudstack-0.0.1-r3.ebuild} | 0 .../coreos-base/oem-cloudstack/oem-cloudstack-0.0.1.ebuild | 7 ++++++- .../coreos-base/oem-digitalocean/files/cloud-config.yml | 1 + ...ocean-0.0.1.ebuild => oem-digitalocean-0.0.1-r1.ebuild} | 7 ++++++- .../coreos-base/oem-ec2-compat/files/cloud-config.yml | 1 + ...mpat-0.0.2-r2.ebuild => oem-ec2-compat-0.0.2-r3.ebuild} | 1 + .../coreos-base/oem-exoscale/files/cloud-config.yml | 1 + ...-exoscale-0.0.1.ebuild => oem-exoscale-0.0.1-r1.ebuild} | 7 ++++++- .../coreos-base/oem-gce/files/cloud-config.yml | 1 + .../{oem-gce-0.0.2-r9.ebuild => oem-gce-0.0.2-r10.ebuild} | 0 .../coreos-base/oem-gce/oem-gce-0.0.2.ebuild | 7 ++++++- .../coreos-base/oem-hyperv/files/cloud-config.yml | 1 + .../{oem-azure-0.0.1.ebuild => oem-hyperv-0.0.1-r1.ebuild} | 7 ++++++- .../oem-rackspace-onmetal/files/cloud-config.yml | 1 + ...-0.0.3.ebuild => oem-rackspace-onmetal-0.0.3-r1.ebuild} | 7 ++++++- .../coreos-base/oem-rackspace/files/cloud-config.yml | 1 + ...space-0.0.1-r8.ebuild => oem-rackspace-0.0.1-r9.ebuild} | 0 .../coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild | 7 ++++++- .../coreos-base/oem-vagrant/files/cloud-config.yml | 1 + ...grant-0.0.1-r11.ebuild => oem-vagrant-0.0.1-r12.ebuild} | 0 .../coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild | 7 ++++++- 24 files changed, 65 insertions(+), 9 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-0.0.1.ebuild => oem-azure-0.0.1-r1.ebuild} (68%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/{oem-cloudstack-0.0.1-r2.ebuild => oem-cloudstack-0.0.1-r3.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/{oem-digitalocean-0.0.1.ebuild => oem-digitalocean-0.0.1-r1.ebuild} (68%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.2-r2.ebuild => oem-ec2-compat-0.0.2-r3.ebuild} (95%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/{oem-exoscale-0.0.1.ebuild => oem-exoscale-0.0.1-r1.ebuild} (80%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/{oem-gce-0.0.2-r9.ebuild => oem-gce-0.0.2-r10.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/{oem-azure-0.0.1.ebuild => oem-hyperv-0.0.1-r1.ebuild} (66%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/{oem-rackspace-onmetal-0.0.3.ebuild => oem-rackspace-onmetal-0.0.3-r1.ebuild} (73%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.1-r8.ebuild => oem-rackspace-0.0.1-r9.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.1-r11.ebuild => oem-vagrant-0.0.1-r12.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml index 214717a691..3477eb670c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml @@ -4,5 +4,6 @@ coreos: oem: id: azure name: Microsoft Azure + version-id: @@OEM_VERSION_ID@@ home-url: https://azure.microsoft.com/ bug-report-url: https://github.com/coreos/bugs/issues diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r1.ebuild similarity index 68% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r1.ebuild index 2fe83fcced..803b976595 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r1.ebuild @@ -17,7 +17,12 @@ S="${WORKDIR}" RDEPEND="dev-lang/python-oem" +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml index 5f3a3c17f1..e6327b2ce1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml @@ -29,5 +29,6 @@ coreos: oem: id: cloudstack name: CloudStack + version-id: @@OEM_VERSION_ID@@ home-url: http://cloudstack.apache.org/ bug-report-url: https://github.com/coreos/coreos-overlay diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1.ebuild index 5797613c03..1b6a542199 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1.ebuild @@ -19,6 +19,11 @@ IUSE="" # no source directory S="${WORKDIR}" +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { into "/usr/share/oem" dobin ${FILESDIR}/cloudstack-dhcp @@ -27,5 +32,5 @@ src_install() { dobin ${FILESDIR}/coreos-setup-environment insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml index 26f020afa1..556d2f8f7e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml @@ -25,5 +25,6 @@ coreos: oem: id: digitalocean name: DigitalOcean + version-id: @@OEM_VERSION_ID@@ home-url: https://www.digitalocean.com/ bug-report-url: https://github.com/coreos/bugs/issues diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1-r1.ebuild similarity index 68% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1-r1.ebuild index 74f19cd044..619d1fde2f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1-r1.ebuild @@ -14,7 +14,12 @@ KEYWORDS="amd64 x86" # no source directory S="${WORKDIR}" +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml index 913f838fa7..a5f393e469 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml @@ -19,6 +19,7 @@ coreos: oem: id: @@OEM_ID@@ name: @@OEM_NAME@@ + version-id: @@OEM_VERSION_ID@@ home-url: @@OEM_HOME_URL@@ bug-report-url: https://github.com/coreos/bugs/issues write_files: diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r3.ebuild similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r3.ebuild index a7042cfc5a..8619320a9f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r3.ebuild @@ -35,6 +35,7 @@ src_prepare() { sed -e "s\\@@OEM_ID@@\\${ID}\\g" \ -e "s\\@@OEM_NAME@@\\${NAME}\\g" \ + -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ -e "s\\@@OEM_HOME_URL@@\\${HOME_URL}\\g" \ ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml index 89f95d9557..a4cc1e277f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml @@ -40,5 +40,6 @@ coreos: oem: id: exoscale name: exoscale + version-id: @@OEM_VERSION_ID@@ home-url: http://www.exoscale.ch bug-report-url: https://github.com/coreos/coreos-overlay diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.1-r1.ebuild similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.1-r1.ebuild index a7defab8eb..fdfe874134 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.1-r1.ebuild @@ -19,6 +19,11 @@ IUSE="" # no source directory S="${WORKDIR}" +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { into "/usr/share/oem" dobin ${FILESDIR}/exoscale-dhcp @@ -28,5 +33,5 @@ src_install() { dobin ${FILESDIR}/exoscale-setup-network insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml index b6358531f9..be265b5d5c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml @@ -105,6 +105,7 @@ coreos: oem: id: gce name: Google Compute Engine + version-id: @@OEM_VERSION_ID@@ home-url: https://cloud.google.com/products/compute-engine/ bug-report-url: https://github.com/coreos/bugs/issues diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild index 34642657aa..9e9dcddd6e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild @@ -20,6 +20,11 @@ RDEPEND=" app-emulation/google-startup-scripts " +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { into "/usr/share/oem" dobin ${FILESDIR}/gce-ssh-key @@ -28,5 +33,5 @@ src_install() { dobin ${FILESDIR}/coreos-setup-environment insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml index 3b1bbb3c6a..563caa8021 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml @@ -4,4 +4,5 @@ coreos: oem: id: hyperv name: Microsoft Hyper-V + version-id: @@OEM_VERSION_ID@@ bug-report-url: https://github.com/coreos/bugs/issues diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-azure-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.1-r1.ebuild similarity index 66% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-azure-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.1-r1.ebuild index 2c60adcb3f..7e79f17a96 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-azure-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.1-r1.ebuild @@ -15,7 +15,12 @@ IUSE="" # no source directory S="${WORKDIR}" +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml index 96576e736d..4d59798a67 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml @@ -64,5 +64,6 @@ coreos: oem: id: onmetal name: Rackspace Teeth + version-id: @@OEM_VERSION_ID@@ home-url: http://www.rackspace.com/ bug-report-url: https://github.com/coreos/bugs/issues diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3-r1.ebuild similarity index 73% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3-r1.ebuild index b081c79f5a..ada1ded465 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3-r1.ebuild @@ -14,11 +14,16 @@ KEYWORDS="amd64 x86" # no source directory S="${WORKDIR}" +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { into "/usr/share/oem" dobin ${FILESDIR}/netname.sh dobin ${FILESDIR}/rename-interfaces.sh insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml index 14161d6575..b451a7893b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml @@ -31,6 +31,7 @@ coreos: oem: id: rackspace name: Rackspace Cloud Servers + version-id: @@OEM_VERSION_ID@@ home-url: https://www.rackspace.com/cloud/servers/ bug-report-url: https://github.com/coreos/coreos-overlay write_files: diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r9.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild index b719144d48..82bcc558b8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild @@ -24,11 +24,16 @@ RDEPEND=" coreos-base/nova-agent-watcher " +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { dodir /usr/share/oem/nova-agent rsync --exclude=".git" -aq ${S}/ ${D}/usr/share/oem/nova-agent/ || die insinto "/usr/share/oem" - doins ${FILESDIR}/cloud-config.yml + doins ${T}/cloud-config.yml into "/usr/share/oem" dobin ${FILESDIR}/coreos-setup-environment diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml index f6512e7b48..0fb8fef9ac 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml @@ -18,6 +18,7 @@ coreos: oem: id: vagrant name: Vagrant + version-id: @@OEM_VERSION_ID@@ home-url: http://www.vagrantup.com/ bug-report-url: https://github.com/coreos/coreos-overlay diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r12.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r11.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r12.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild index 4c076dcc14..3e62805e9e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild @@ -15,9 +15,14 @@ IUSE="" # no source directory S="${WORKDIR}" +src_prepare() { + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die +} + src_install() { insinto "/usr/share/oem" - doins "${FILESDIR}/cloud-config.yml" + doins "${T}/cloud-config.yml" doins -r "${FILESDIR}/box" into "/usr/share/oem"