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

Merge pull request #328 from marineam/fix-docker

Browse Source 
fix(coreos-base/coreos-init): Sync up stable and live ebuilds.
This commit is contained in:
Michael Marineau 2014-01-30 14:13:41 -08:00
commit 6eab81061b
3 changed files with 11 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r36.ebuild vendored
View File

@ -1 +1 @@
coreos-init-0.0.1.ebuild
coreos-init-9999.ebuild

59
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild vendored
View File

@ -1,59 +0,0 @@
# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
CROS_WORKON_COMMIT="8130badcdf5e8961c056ac8610df2a9c7ef40b07"
CROS_WORKON_PROJECT="coreos/init"
CROS_WORKON_LOCALNAME="init"
EGIT_REPO_URI="https://github.com/coreos/init"
inherit cros-workon systemd
DESCRIPTION="Init scripts for CoreOS"
HOMEPAGE="http://www.coreos.com/"
SRC_URI=""
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 arm x86"
IUSE="test symlink-usr"
# Daemons we enable here must installed during build/install in addition to
# during runtime so the systemd unit enable step works.
DEPEND="
app-emulation/docker
net-misc/dhcpcd
net-misc/openssh
!<dev-db/etcd-0.0.1-r6
!coreos-base/oem-service
test? ( dev-lang/python:2.7 )
"
RDEPEND="${DEPEND}
sys-block/parted
sys-apps/gptfdisk
sys-apps/systemd
"
src_install() {
if use symlink-usr ; then
emake DESTDIR="${D}" install-usr
systemd_enable_service local-fs.target remount-root.service
else
emake DESTDIR="${D}" install
fi
# Set the default target to multi-user not graphical, this is CoreOS!
dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target
systemd_enable_service basic.target coreos-startup.target
# Services!
systemd_enable_service default.target coreos-c10n.service
systemd_enable_service default.target local-enable.service
systemd_enable_service default.target dhcpcd.service
systemd_enable_service default.target sshd-keygen.service
systemd_enable_service default.target sshd.socket
systemd_enable_service default.target ssh-key-proc-cmdline.service
systemd_enable_service sockets.target docker.socket
}

13
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild vendored
View File

@ -3,9 +3,16 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
EGIT_REPO_URI="https://github.com/coreos/init"
CROS_WORKON_PROJECT="coreos/init"
CROS_WORKON_LOCALNAME="init"
CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="8130badcdf5e8961c056ac8610df2a9c7ef40b07"
KEYWORDS="amd64 arm x86"
fi
inherit cros-workon systemd
@ -15,12 +22,12 @@ SRC_URI=""
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="test symlink-usr"
# Daemons we enable here must installed during build/install in addition to
# during runtime so the systemd unit enable step works.
DEPEND="
app-emulation/docker
net-misc/dhcpcd
net-misc/openssh
!<dev-db/etcd-0.0.1-r6
@ -53,5 +60,5 @@ src_install() {
systemd_enable_service default.target sshd-keygen.service
systemd_enable_service default.target sshd.socket
systemd_enable_service default.target ssh-key-proc-cmdline.service
systemd_enable_service default.target docker.service
systemd_enable_service sockets.target docker.socket
}