mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 10:27:00 +02:00
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.
This commit is contained in:
parent
d3fe403bf3
commit
1fff89a178
@ -30,6 +30,7 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
into "/usr/share/oem"
|
||||
dobin ${S}/scripts/gentoo-to-networkd
|
||||
dobin ${S}/bin/nova-agent-watcher
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ IUSE=""
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_install() {
|
||||
insinto "/"
|
||||
insinto "/usr/share/oem"
|
||||
doins "${FILESDIR}/authorized_keys"
|
||||
doins "${FILESDIR}/cloud-config.yml"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user