From d99ae281bc4fb13f6462ea1e272d120328123e35 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 17 Jul 2015 18:10:34 -0700 Subject: [PATCH] coreos-base/oem-*: wrap variables in quotes --- ...re-2.0.11-r2.ebuild => oem-azure-2.0.12.ebuild} | 6 +++--- ...0.0.1-r1.ebuild => oem-cloudsigma-0.0.2.ebuild} | 4 ++-- .../oem-cloudstack/oem-cloudstack-0.0.1-r3.ebuild | 1 - ...ck-0.0.1.ebuild => oem-cloudstack-0.0.2.ebuild} | 12 ++++++------ ...-0.0.2.ebuild => oem-digitalocean-0.0.3.ebuild} | 4 ++-- ...0.0.3-r3.ebuild => oem-ec2-compat-0.0.4.ebuild} | 6 +++--- ...cale-0.0.2.ebuild => oem-exoscale-0.0.3.ebuild} | 12 ++++++------ .../{oem-gce-0.0.3.ebuild => oem-gce-0.0.4.ebuild} | 14 +++++++------- ...erv-0.0.1-r1.ebuild => oem-hyperv-0.0.2.ebuild} | 4 ++-- ...ud-0.0.1.ebuild => oem-niftycloud-0.0.2.ebuild} | 10 +++++----- ...packet-0.0.1.ebuild => oem-packet-0.0.2.ebuild} | 8 ++++---- ...5.ebuild => oem-rackspace-onmetal-0.0.6.ebuild} | 10 +++++----- .../oem-rackspace/oem-rackspace-0.0.1-r10.ebuild | 1 - ...ace-0.0.1.ebuild => oem-rackspace-0.0.2.ebuild} | 8 ++++---- ...y-0.0.1.ebuild => oem-vagrant-key-0.0.2.ebuild} | 0 .../oem-vagrant/oem-vagrant-0.0.1-r13.ebuild | 1 - ...grant-0.0.1.ebuild => oem-vagrant-0.0.2.ebuild} | 4 ++-- ...e-9.10.0.ebuild => oem-vmware-9.10.0-r1.ebuild} | 2 +- ...m0-4.4.1.ebuild => oem-xendom0-4.4.1-r1.ebuild} | 8 ++++---- 19 files changed, 56 insertions(+), 59 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-2.0.11-r2.ebuild => oem-azure-2.0.12.ebuild} (76%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/{oem-cloudsigma-0.0.1-r1.ebuild => oem-cloudsigma-0.0.2.ebuild} (80%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r3.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/{oem-cloudstack-0.0.1.ebuild => oem-cloudstack-0.0.2.ebuild} (65%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/{oem-digitalocean-0.0.2.ebuild => oem-digitalocean-0.0.3.ebuild} (80%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.3-r3.ebuild => oem-ec2-compat-0.0.4.ebuild} (86%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/{oem-exoscale-0.0.2.ebuild => oem-exoscale-0.0.3.ebuild} (65%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/{oem-gce-0.0.3.ebuild => oem-gce-0.0.4.ebuild} (64%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/{oem-hyperv-0.0.1-r1.ebuild => oem-hyperv-0.0.2.ebuild} (79%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/{oem-niftycloud-0.0.1.ebuild => oem-niftycloud-0.0.2.ebuild} (67%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/{oem-packet-0.0.1.ebuild => oem-packet-0.0.2.ebuild} (70%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/{oem-rackspace-onmetal-0.0.5.ebuild => oem-rackspace-onmetal-0.0.6.ebuild} (67%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r10.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.1.ebuild => oem-rackspace-0.0.2.ebuild} (75%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/{oem-vagrant-key-0.0.1.ebuild => oem-vagrant-key-0.0.2.ebuild} (100%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r13.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.1.ebuild => oem-vagrant-0.0.2.ebuild} (80%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/{oem-vmware-9.10.0.ebuild => oem-vmware-9.10.0-r1.ebuild} (89%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/{oem-xendom0-4.4.1.ebuild => oem-xendom0-4.4.1-r1.ebuild} (71%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12.ebuild similarity index 76% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12.ebuild index 3310a1c0c0..4144fe759f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12.ebuild @@ -19,11 +19,11 @@ RDEPEND="app-emulation/wa-linux-agent" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { insinto "/usr/share/oem" - doins ${T}/cloud-config.yml - doins ${FILESDIR}/grub.cfg + doins "${T}/cloud-config.yml" + doins "${FILESDIR}/grub.cfg" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.2.ebuild similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.2.ebuild index 4edfd6e6e8..d72c901f37 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.2.ebuild @@ -16,10 +16,10 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r3.ebuild deleted file mode 120000 index 9492e515ee..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1-r3.ebuild +++ /dev/null @@ -1 +0,0 @@ -oem-cloudstack-0.0.1.ebuild \ No newline at end of file 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.2.ebuild similarity index 65% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.2.ebuild index 1b6a542199..d217bf0392 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.2.ebuild @@ -21,16 +21,16 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { into "/usr/share/oem" - dobin ${FILESDIR}/cloudstack-dhcp - dobin ${FILESDIR}/cloudstack-ssh-key - dobin ${FILESDIR}/cloudstack-coreos-cloudinit - dobin ${FILESDIR}/coreos-setup-environment + dobin "${FILESDIR}/cloudstack-dhcp" + dobin "${FILESDIR}/cloudstack-ssh-key" + dobin "${FILESDIR}/cloudstack-coreos-cloudinit" + dobin "${FILESDIR}/coreos-setup-environment" insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.3.ebuild similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.3.ebuild index 619d1fde2f..ed9fc31510 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.3.ebuild @@ -16,10 +16,10 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.4.ebuild similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.4.ebuild index d83e5efb76..d7429c320a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.4.ebuild @@ -37,13 +37,13 @@ src_prepare() { -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 + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" if use ec2 ; then - newins ${FILESDIR}/grub-ec2.cfg grub.cfg + newins "${FILESDIR}/grub-ec2.cfg" grub.cfg fi } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.3.ebuild similarity index 65% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.3.ebuild index 80ecddd8bc..49354b1f6f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.3.ebuild @@ -21,16 +21,16 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { into "/usr/share/oem" - dobin ${FILESDIR}/exoscale-dhcp - dobin ${FILESDIR}/exoscale-ssh-key - dobin ${FILESDIR}/exoscale-coreos-cloudinit - dobin ${FILESDIR}/coreos-setup-environment + dobin "${FILESDIR}/exoscale-dhcp" + dobin "${FILESDIR}/exoscale-ssh-key" + dobin "${FILESDIR}/exoscale-coreos-cloudinit" + dobin "${FILESDIR}/coreos-setup-environment" insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.4.ebuild similarity index 64% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.4.ebuild index 423839dfeb..17fb643528 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.4.ebuild @@ -22,17 +22,17 @@ RDEPEND=" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { into "/usr/share/oem" - dobin ${FILESDIR}/gce-ssh-key - dobin ${FILESDIR}/gce-coreos-cloudinit - dobin ${FILESDIR}/gce-add-metadata-host - dobin ${FILESDIR}/coreos-setup-environment + dobin "${FILESDIR}/gce-ssh-key" + dobin "${FILESDIR}/gce-coreos-cloudinit" + dobin "${FILESDIR}/gce-add-metadata-host" + dobin "${FILESDIR}/coreos-setup-environment" insinto "/usr/share/oem" - doins ${T}/cloud-config.yml - doins ${FILESDIR}/grub.cfg + doins "${T}/cloud-config.yml" + doins "${FILESDIR}/grub.cfg" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.2.ebuild similarity index 79% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.2.ebuild index 7e79f17a96..4da8471a33 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.2.ebuild @@ -17,10 +17,10 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.2.ebuild similarity index 67% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.2.ebuild index 11a78ee95f..4c94749fbd 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.2.ebuild @@ -22,15 +22,15 @@ RDEPEND="${DEPEND}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { into "/usr/share/oem" - dobin ${FILESDIR}/niftycloud-ssh-key - dobin ${FILESDIR}/niftycloud-coreos-cloudinit - dobin ${FILESDIR}/coreos-setup-environment + dobin "${FILESDIR}/niftycloud-ssh-key" + dobin "${FILESDIR}/niftycloud-coreos-cloudinit" + dobin "${FILESDIR}/coreos-setup-environment" insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.2.ebuild similarity index 70% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.2.ebuild index 523183ecf8..cd0c5740e2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.2.ebuild @@ -16,14 +16,14 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { into "/usr/share/oem" - dobin ${FILESDIR}/phone-home.sh - dobin ${FILESDIR}/reset-interfaces.sh + dobin "${FILESDIR}/phone-home.sh" + dobin "${FILESDIR}/reset-interfaces.sh" insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.6.ebuild similarity index 67% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.6.ebuild index 890d3280a5..22653cf130 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.6.ebuild @@ -16,15 +16,15 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { into "/usr/share/oem" - dobin ${FILESDIR}/netname.sh - dobin ${FILESDIR}/rename-interfaces.sh + dobin "${FILESDIR}/netname.sh" + dobin "${FILESDIR}/rename-interfaces.sh" insinto "/usr/share/oem" - doins ${T}/cloud-config.yml - doins ${FILESDIR}/grub.cfg + doins "${T}/cloud-config.yml" + doins "${FILESDIR}/grub.cfg" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r10.ebuild deleted file mode 120000 index 93bd123481..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r10.ebuild +++ /dev/null @@ -1 +0,0 @@ -oem-rackspace-0.0.1.ebuild \ No newline at end of file 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.2.ebuild similarity index 75% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.2.ebuild index 82bcc558b8..8398c2bd20 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.2.ebuild @@ -26,15 +26,15 @@ RDEPEND=" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${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 + rsync --exclude=".git" -aq "${S}/" "${D}/usr/share/oem/nova-agent/" || die insinto "/usr/share/oem" - doins ${T}/cloud-config.yml + doins "${T}/cloud-config.yml" into "/usr/share/oem" - dobin ${FILESDIR}/coreos-setup-environment + dobin "${FILESDIR}/coreos-setup-environment" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r13.ebuild deleted file mode 120000 index 4aa0c75f40..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r13.ebuild +++ /dev/null @@ -1 +0,0 @@ -oem-vagrant-0.0.1.ebuild \ No newline at end of file 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.2.ebuild similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.2.ebuild index 3e62805e9e..4f4df6ac6e 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.2.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { @@ -26,5 +26,5 @@ src_install() { doins -r "${FILESDIR}/box" into "/usr/share/oem" - dobin ${FILESDIR}/coreos-setup-environment + dobin "${FILESDIR}/coreos-setup-environment" } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r1.ebuild similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r1.ebuild index e710b6b8b2..045f0bfb42 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r1.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}" src_prepare() { sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - "${FILESDIR}"/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r1.ebuild similarity index 71% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r1.ebuild index 67dfd0d5a0..8d21c0add9 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r1.ebuild @@ -17,13 +17,13 @@ S="${WORKDIR}" src_prepare() { sed -e "s%@@OEM_VERSION_ID@@%${PVR}%g" \ - ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die + "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die sed -e "s%@@XEN_VERSION@@%${PV}%g" \ - ${FILESDIR}/grub.cfg > ${T}/grub.cfg || die + "${FILESDIR}/grub.cfg" > "${T}/grub.cfg" || die } src_install() { insinto "/usr/share/oem" - doins ${T}/cloud-config.yml - doins ${T}/grub.cfg + doins "${T}/cloud-config.yml" + doins "${T}/grub.cfg" }