Propagate $PVR to the oem-*/files/cloud-config.yml files as version-id

This commit is contained in:
Vito Caputo 2014-09-22 20:41:40 -04:00
parent 8d7976808d
commit fd08f00578
24 changed files with 65 additions and 9 deletions

View File

@ -4,5 +4,6 @@ coreos:
oem: oem:
id: azure id: azure
name: Microsoft Azure name: Microsoft Azure
version-id: @@OEM_VERSION_ID@@
home-url: https://azure.microsoft.com/ home-url: https://azure.microsoft.com/
bug-report-url: https://github.com/coreos/bugs/issues bug-report-url: https://github.com/coreos/bugs/issues

View File

@ -17,7 +17,12 @@ S="${WORKDIR}"
RDEPEND="dev-lang/python-oem" 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() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
} }

View File

@ -29,5 +29,6 @@ coreos:
oem: oem:
id: cloudstack id: cloudstack
name: CloudStack name: CloudStack
version-id: @@OEM_VERSION_ID@@
home-url: http://cloudstack.apache.org/ home-url: http://cloudstack.apache.org/
bug-report-url: https://github.com/coreos/coreos-overlay bug-report-url: https://github.com/coreos/coreos-overlay

View File

@ -19,6 +19,11 @@ IUSE=""
# no source directory # no source directory
S="${WORKDIR}" S="${WORKDIR}"
src_prepare() {
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
}
src_install() { src_install() {
into "/usr/share/oem" into "/usr/share/oem"
dobin ${FILESDIR}/cloudstack-dhcp dobin ${FILESDIR}/cloudstack-dhcp
@ -27,5 +32,5 @@ src_install() {
dobin ${FILESDIR}/coreos-setup-environment dobin ${FILESDIR}/coreos-setup-environment
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
} }

View File

@ -25,5 +25,6 @@ coreos:
oem: oem:
id: digitalocean id: digitalocean
name: DigitalOcean name: DigitalOcean
version-id: @@OEM_VERSION_ID@@
home-url: https://www.digitalocean.com/ home-url: https://www.digitalocean.com/
bug-report-url: https://github.com/coreos/bugs/issues bug-report-url: https://github.com/coreos/bugs/issues

View File

@ -14,7 +14,12 @@ KEYWORDS="amd64 x86"
# no source directory # no source directory
S="${WORKDIR}" S="${WORKDIR}"
src_prepare() {
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
}
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
} }

View File

@ -19,6 +19,7 @@ coreos:
oem: oem:
id: @@OEM_ID@@ id: @@OEM_ID@@
name: @@OEM_NAME@@ name: @@OEM_NAME@@
version-id: @@OEM_VERSION_ID@@
home-url: @@OEM_HOME_URL@@ home-url: @@OEM_HOME_URL@@
bug-report-url: https://github.com/coreos/bugs/issues bug-report-url: https://github.com/coreos/bugs/issues
write_files: write_files:

View File

@ -35,6 +35,7 @@ src_prepare() {
sed -e "s\\@@OEM_ID@@\\${ID}\\g" \ sed -e "s\\@@OEM_ID@@\\${ID}\\g" \
-e "s\\@@OEM_NAME@@\\${NAME}\\g" \ -e "s\\@@OEM_NAME@@\\${NAME}\\g" \
-e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
-e "s\\@@OEM_HOME_URL@@\\${HOME_URL}\\g" \ -e "s\\@@OEM_HOME_URL@@\\${HOME_URL}\\g" \
${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
} }

View File

@ -40,5 +40,6 @@ coreos:
oem: oem:
id: exoscale id: exoscale
name: exoscale name: exoscale
version-id: @@OEM_VERSION_ID@@
home-url: http://www.exoscale.ch home-url: http://www.exoscale.ch
bug-report-url: https://github.com/coreos/coreos-overlay bug-report-url: https://github.com/coreos/coreos-overlay

View File

@ -19,6 +19,11 @@ IUSE=""
# no source directory # no source directory
S="${WORKDIR}" S="${WORKDIR}"
src_prepare() {
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
}
src_install() { src_install() {
into "/usr/share/oem" into "/usr/share/oem"
dobin ${FILESDIR}/exoscale-dhcp dobin ${FILESDIR}/exoscale-dhcp
@ -28,5 +33,5 @@ src_install() {
dobin ${FILESDIR}/exoscale-setup-network dobin ${FILESDIR}/exoscale-setup-network
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
} }

View File

@ -105,6 +105,7 @@ coreos:
oem: oem:
id: gce id: gce
name: Google Compute Engine name: Google Compute Engine
version-id: @@OEM_VERSION_ID@@
home-url: https://cloud.google.com/products/compute-engine/ home-url: https://cloud.google.com/products/compute-engine/
bug-report-url: https://github.com/coreos/bugs/issues bug-report-url: https://github.com/coreos/bugs/issues

View File

@ -20,6 +20,11 @@ RDEPEND="
app-emulation/google-startup-scripts 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() { src_install() {
into "/usr/share/oem" into "/usr/share/oem"
dobin ${FILESDIR}/gce-ssh-key dobin ${FILESDIR}/gce-ssh-key
@ -28,5 +33,5 @@ src_install() {
dobin ${FILESDIR}/coreos-setup-environment dobin ${FILESDIR}/coreos-setup-environment
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
} }

View File

@ -4,4 +4,5 @@ coreos:
oem: oem:
id: hyperv id: hyperv
name: Microsoft Hyper-V name: Microsoft Hyper-V
version-id: @@OEM_VERSION_ID@@
bug-report-url: https://github.com/coreos/bugs/issues bug-report-url: https://github.com/coreos/bugs/issues

View File

@ -15,7 +15,12 @@ IUSE=""
# no source directory # no source directory
S="${WORKDIR}" S="${WORKDIR}"
src_prepare() {
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
}
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
} }

View File

@ -64,5 +64,6 @@ coreos:
oem: oem:
id: onmetal id: onmetal
name: Rackspace Teeth name: Rackspace Teeth
version-id: @@OEM_VERSION_ID@@
home-url: http://www.rackspace.com/ home-url: http://www.rackspace.com/
bug-report-url: https://github.com/coreos/bugs/issues bug-report-url: https://github.com/coreos/bugs/issues

View File

@ -14,11 +14,16 @@ KEYWORDS="amd64 x86"
# no source directory # no source directory
S="${WORKDIR}" S="${WORKDIR}"
src_prepare() {
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
}
src_install() { src_install() {
into "/usr/share/oem" into "/usr/share/oem"
dobin ${FILESDIR}/netname.sh dobin ${FILESDIR}/netname.sh
dobin ${FILESDIR}/rename-interfaces.sh dobin ${FILESDIR}/rename-interfaces.sh
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
} }

View File

@ -31,6 +31,7 @@ coreos:
oem: oem:
id: rackspace id: rackspace
name: Rackspace Cloud Servers name: Rackspace Cloud Servers
version-id: @@OEM_VERSION_ID@@
home-url: https://www.rackspace.com/cloud/servers/ home-url: https://www.rackspace.com/cloud/servers/
bug-report-url: https://github.com/coreos/coreos-overlay bug-report-url: https://github.com/coreos/coreos-overlay
write_files: write_files:

View File

@ -24,11 +24,16 @@ RDEPEND="
coreos-base/nova-agent-watcher 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() { src_install() {
dodir /usr/share/oem/nova-agent dodir /usr/share/oem/nova-agent
rsync --exclude=".git" -aq ${S}/ ${D}/usr/share/oem/nova-agent/ || die rsync --exclude=".git" -aq ${S}/ ${D}/usr/share/oem/nova-agent/ || die
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${T}/cloud-config.yml
into "/usr/share/oem" into "/usr/share/oem"
dobin ${FILESDIR}/coreos-setup-environment dobin ${FILESDIR}/coreos-setup-environment

View File

@ -18,6 +18,7 @@ coreos:
oem: oem:
id: vagrant id: vagrant
name: Vagrant name: Vagrant
version-id: @@OEM_VERSION_ID@@
home-url: http://www.vagrantup.com/ home-url: http://www.vagrantup.com/
bug-report-url: https://github.com/coreos/coreos-overlay bug-report-url: https://github.com/coreos/coreos-overlay

View File

@ -15,9 +15,14 @@ IUSE=""
# no source directory # no source directory
S="${WORKDIR}" S="${WORKDIR}"
src_prepare() {
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
}
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${FILESDIR}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins -r "${FILESDIR}/box" doins -r "${FILESDIR}/box"
into "/usr/share/oem" into "/usr/share/oem"