mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 10:27:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(coreos-base/oem-*): Install OEM packages into /usr/share/oem

Browse Source 
The install script no longer sets ROOT to /usr/share/oem so the ebuilds
need to install themselves into the correct path.
This commit is contained in:
Michael Marineau 2014-03-27 22:44:18 -07:00
parent d3fe403bf3
commit 1fff89a178
11 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.4.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.5.ebuild vendored
View File

1
sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild vendored
View File

@ -30,6 +30,7 @@ src_compile() {
} }
src_install() { src_install() {
into "/usr/share/oem"
dobin ${S}/scripts/gentoo-to-networkd dobin ${S}/scripts/gentoo-to-networkd
dobin ${S}/bin/nova-agent-watcher dobin ${S}/bin/nova-agent-watcher
} }

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r11.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r12.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild vendored
View File

@ -16,12 +16,12 @@ IUSE=""
S="${WORKDIR}" S="${WORKDIR}"
src_install() { src_install() {
into "/" into "/usr/share/oem"
dobin ${FILESDIR}/ec2-ssh-key dobin ${FILESDIR}/ec2-ssh-key
dobin ${FILESDIR}/coreos-setup-environment dobin ${FILESDIR}/coreos-setup-environment
dobin ${FILESDIR}/coreos-c10n dobin ${FILESDIR}/coreos-c10n
dobin ${FILESDIR}/etcd-bootstrap dobin ${FILESDIR}/etcd-bootstrap
insinto "/" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${FILESDIR}/cloud-config.yml
} }

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r1.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r2.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild vendored
View File

@ -16,11 +16,11 @@ IUSE=""
S="${WORKDIR}" S="${WORKDIR}"
src_install() { src_install() {
into "/" into "/usr/share/oem"
dobin ${FILESDIR}/gce-ssh-key dobin ${FILESDIR}/gce-ssh-key
dobin ${FILESDIR}/gce-coreos-cloudinit dobin ${FILESDIR}/gce-coreos-cloudinit
dobin ${FILESDIR}/gce-setup-environment dobin ${FILESDIR}/gce-setup-environment
insinto "/" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${FILESDIR}/cloud-config.yml
} }

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml vendored
View File

@ -27,7 +27,7 @@ coreos:
After=dbus.service After=dbus.service
[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 - name: media-configdrive.mount
command: restart command: restart
runtime: yes runtime: yes

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r3.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r4.ebuild vendored
View File

6
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild vendored
View File

@ -25,10 +25,10 @@ RDEPEND="
" "
src_install() { src_install() {
rsync --exclude=".git" -aq ${S}/ ${D}/nova-agent/ rsync --exclude=".git" -aq ${S}/ ${D}/usr/share/oem/nova-agent/
insinto "/" insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml doins ${FILESDIR}/cloud-config.yml
into "/" into "/usr/share/oem"
dobin ${FILESDIR}/coreos-setup-environment dobin ${FILESDIR}/coreos-setup-environment
} }

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r3.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r4.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild vendored
View File

@ -16,7 +16,7 @@ IUSE=""
S="${WORKDIR}" S="${WORKDIR}"
src_install() { src_install() {
insinto "/" insinto "/usr/share/oem"
doins "${FILESDIR}/authorized_keys" doins "${FILESDIR}/authorized_keys"
doins "${FILESDIR}/cloud-config.yml" doins "${FILESDIR}/cloud-config.yml"
} }