From 5e3fdfd9f697965f467c418261b82be8e9fe6c28 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Tue, 19 Nov 2013 17:30:43 -0800 Subject: [PATCH 1/3] feat(coreinit): add coreinit to the experimental package, drop systemd-rest --- .../app-admin/coreinit/coreinit-9999.ebuild | 34 +++++++++++++++++++ .../app-admin/coreinit/files/coreinit.service | 13 +++++++ ...ld => coreos-experimental-0.0.1-r4.ebuild} | 0 .../coreos-experimental-0.0.1.ebuild | 2 +- 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/{coreos-experimental-0.0.1-r3.ebuild => coreos-experimental-0.0.1-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild new file mode 100644 index 0000000000..b6513185fb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild @@ -0,0 +1,34 @@ +# +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2013 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header:$ +# + +EAPI=4 +CROS_WORKON_PROJECT="coreos/coreinit" +CROS_WORKON_LOCALNAME="coreinit" +CROS_WORKON_REPO="git://github.com" +inherit toolchain-funcs cros-workon systemd + +DESCRIPTION="coreinit" +HOMEPAGE="https://github.com/coreos/coreinit" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND=">=dev-lang/go-1.1" + +src_compile() { + ./build +} + +src_install() { + dobin ${S}/${PN} + + systemd_dounit "${FILESDIR}"/${PN}.service + systemd_enable_service multi-user.target ${PN}.service +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service new file mode 100644 index 0000000000..adf11ad360 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service @@ -0,0 +1,13 @@ +[Unit] +Description=coreinit + +[Service] +ExecStart=/usr/bin/coreinit + +Restart=always +# Set a longish timeout in case this machine isn't behaving +# nicely and bothering the rest of the cluster +RestartSec=10s + +[Install] +WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild index ee8a30220b..81cafd46cc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild @@ -14,5 +14,5 @@ IUSE="" DEPEND="" RDEPEND=" - app-admin/systemd-rest + app-admin/coreinit " From 00c0d7dba44da841bc6cb8cb14e516800b7e006e Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Tue, 19 Nov 2013 17:34:29 -0800 Subject: [PATCH 2/3] drop restart --- .../coreos-overlay/app-admin/coreinit/files/coreinit.service | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service index adf11ad360..e1ea598a39 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/files/coreinit.service @@ -4,10 +4,5 @@ Description=coreinit [Service] ExecStart=/usr/bin/coreinit -Restart=always -# Set a longish timeout in case this machine isn't behaving -# nicely and bothering the rest of the cluster -RestartSec=10s - [Install] WantedBy=multi-user.target From b808a92fffddba69b4fbed18a0a327a0a6562ba6 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Tue, 19 Nov 2013 17:43:31 -0800 Subject: [PATCH 3/3] add corectl --- .../coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild index b6513185fb..719aa53e9d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/coreinit/coreinit-9999.ebuild @@ -27,7 +27,8 @@ src_compile() { } src_install() { - dobin ${S}/${PN} + dobin ${S}/coreinit + dobin ${S}/corectl systemd_dounit "${FILESDIR}"/${PN}.service systemd_enable_service multi-user.target ${PN}.service