From 1fff89a178edcbd2005ccde48c695cc462d109ad Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 27 Mar 2014 22:44:18 -0700 Subject: [PATCH] fix(coreos-base/oem-*): Install OEM packages into /usr/share/oem The install script no longer sets ROOT to /usr/share/oem so the ebuilds need to install themselves into the correct path. --- ...watcher-0.0.4.ebuild => nova-agent-watcher-0.0.5.ebuild} | 0 .../nova-agent-watcher/nova-agent-watcher-9999.ebuild | 1 + .../{oem-ami-0.0.1-r11.ebuild => oem-ami-0.0.1-r12.ebuild} | 0 .../coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild | 4 ++-- .../{oem-gce-0.0.1-r1.ebuild => oem-gce-0.0.1-r2.ebuild} | 0 .../coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild | 4 ++-- .../coreos-base/oem-rackspace/files/cloud-config.yml | 2 +- ...kspace-0.0.1-r3.ebuild => oem-rackspace-0.0.1-r4.ebuild} | 0 .../coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild | 6 +++--- ...-vagrant-0.0.1-r3.ebuild => oem-vagrant-0.0.1-r4.ebuild} | 0 .../coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild | 2 +- 11 files changed, 10 insertions(+), 9 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/{nova-agent-watcher-0.0.4.ebuild => nova-agent-watcher-0.0.5.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/{oem-ami-0.0.1-r11.ebuild => oem-ami-0.0.1-r12.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/{oem-gce-0.0.1-r1.ebuild => oem-gce-0.0.1-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.1-r3.ebuild => oem-rackspace-0.0.1-r4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.1-r3.ebuild => oem-vagrant-0.0.1-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild index 6f313fc2b8..6bcad493fe 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild @@ -30,6 +30,7 @@ src_compile() { } src_install() { + into "/usr/share/oem" dobin ${S}/scripts/gentoo-to-networkd dobin ${S}/bin/nova-agent-watcher } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r12.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r11.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r12.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild index 66f8a7d16e..c228e88adc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild @@ -16,12 +16,12 @@ IUSE="" S="${WORKDIR}" src_install() { - into "/" + into "/usr/share/oem" dobin ${FILESDIR}/ec2-ssh-key dobin ${FILESDIR}/coreos-setup-environment dobin ${FILESDIR}/coreos-c10n dobin ${FILESDIR}/etcd-bootstrap - insinto "/" + insinto "/usr/share/oem" doins ${FILESDIR}/cloud-config.yml } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild index fcc12bd5ec..37e86421ab 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild @@ -16,11 +16,11 @@ IUSE="" S="${WORKDIR}" src_install() { - into "/" + into "/usr/share/oem" dobin ${FILESDIR}/gce-ssh-key dobin ${FILESDIR}/gce-coreos-cloudinit dobin ${FILESDIR}/gce-setup-environment - insinto "/" + insinto "/usr/share/oem" doins ${FILESDIR}/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 6ffe801ed4..eedfd199e2 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 @@ -27,7 +27,7 @@ coreos: After=dbus.service [Service] - ExecStart=/usr/share/oem/usr/bin/nova-agent-watcher -watch-dir=/usr/share/oem/nova-agent -scripts-dir=/usr/share/oem/usr/bin/ + ExecStart=/usr/share/oem/bin/nova-agent-watcher -watch-dir=/usr/share/oem/nova-agent -scripts-dir=/usr/share/oem/bin/ - name: media-configdrive.mount command: restart runtime: yes diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r4.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 38afcc6068..eff05cb9aa 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 @@ -25,10 +25,10 @@ RDEPEND=" " src_install() { - rsync --exclude=".git" -aq ${S}/ ${D}/nova-agent/ - insinto "/" + rsync --exclude=".git" -aq ${S}/ ${D}/usr/share/oem/nova-agent/ + insinto "/usr/share/oem" doins ${FILESDIR}/cloud-config.yml - into "/" + into "/usr/share/oem" dobin ${FILESDIR}/coreos-setup-environment } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r4.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 1cf2351b8d..a782a3b8aa 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 @@ -16,7 +16,7 @@ IUSE="" S="${WORKDIR}" src_install() { - insinto "/" + insinto "/usr/share/oem" doins "${FILESDIR}/authorized_keys" doins "${FILESDIR}/cloud-config.yml" }