Merge pull request #494 from marineam/oem

OEM reorg
This commit is contained in:
Michael Marineau 2014-03-28 17:44:09 -07:00
commit 2bdbc982cf
14 changed files with 34 additions and 10 deletions

View File

@ -32,7 +32,7 @@ IUSE="bluetooth opengl X"
# dev-util/hdctools
# app-benchmarks/punybench
# dev-util/libc-bench
RDEPEND="${RDEPEND}
RDEPEND="
app-admin/sudo
app-arch/gzip
app-arch/tar
@ -41,6 +41,7 @@ RDEPEND="${RDEPEND}
app-misc/evtest
app-portage/gentoolkit
app-shells/bash
coreos-base/coreos
coreos-base/gmerge
dev-lang/python
dev-python/dbus-python
@ -65,6 +66,7 @@ RDEPEND="${RDEPEND}
sys-apps/smartmontools
sys-apps/usbutils
sys-apps/which
sys-devel/gcc
sys-devel/gdb
sys-fs/fuse
sys-fs/lvm2

View File

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

View File

@ -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
}

View File

@ -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
}

View File

@ -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

View File

@ -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
}

View File

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

View File

@ -0,0 +1,21 @@
# Copyright 2013 The CoreOS Authors
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
DESCRIPTION="Meta ebuild for building all binary packages."
HOMEPAGE="http://coreos.com/docs/sdk/"
SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64"
IUSE=""
DEPEND=""
RDEPEND="
coreos-base/coreos
coreos-base/coreos-dev
"
# dev-lang/python-oem