From 778da2e56a5e4893a40ccdb6c44829f612980856 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 27 May 2013 12:45:06 -0700 Subject: [PATCH 1/5] add etcd and etcd-client --- .../etcd-client/etcd-client-9999.ebuild | 36 +++++++++++++++++++ .../etcd-client/files/etcd-client.service | 5 +++ .../app-admin/etcd/etcd-9999.ebuild | 36 +++++++++++++++++++ .../app-admin/etcd/files/etcd.service | 5 +++ 4 files changed, 82 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/files/etcd-client.service create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild new file mode 100644 index 0000000000..ba5240756c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild @@ -0,0 +1,36 @@ +# +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header:$ +# + +EAPI=2 +CROS_WORKON_PROJECT="xiangli-cmu/etcd-client" +CROS_WORKON_LOCALNAME="etcd-client" +CROS_WORKON_REPO="git://github.com" +inherit toolchain-funcs cros-workon systemd + +DESCRIPTION="etcd-client" +HOMEPAGE="https://github.com/xiangli-cmu/etcd-client" +SRC_URI="" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND=">=dev-lang/go-1.0.2" +GOROOT="${ED}usr/$(get_libdir)/go" +GOPKG="${PN}" + +src_compile() { + export GOPATH="${S}" + go install "${PN}" +} + +src_install() { + dosbin ${S}/etcd-client + 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/etcd-client/files/etcd-client.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/files/etcd-client.service new file mode 100644 index 0000000000..9ee6b64e36 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/files/etcd-client.service @@ -0,0 +1,5 @@ +[Service] +ExecStart=/usr/sbin/etcd-client + +[Install] +WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild new file mode 100644 index 0000000000..00906dc85b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild @@ -0,0 +1,36 @@ +# +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header:$ +# + +EAPI=2 +CROS_WORKON_PROJECT="xiangli-cmu/etcd" +CROS_WORKON_LOCALNAME="etcd" +CROS_WORKON_REPO="git://github.com" +inherit toolchain-funcs cros-workon systemd + +DESCRIPTION="etcd" +HOMEPAGE="https://github.com/xiangli-cmu/etcd" +SRC_URI="" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND=">=dev-lang/go-1.0.2" +GOROOT="${ED}usr/$(get_libdir)/go" +GOPKG="${PN}" + +src_compile() { + export GOPATH="${S}" + go install "${PN}" +} + +src_install() { + dosbin ${S}/etcd + 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/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service new file mode 100644 index 0000000000..95b830b431 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service @@ -0,0 +1,5 @@ +[Service] +ExecStart=/usr/sbin/etcd + +[Install] +WantedBy=multi-user.target From 7d1988d4151f0b75e04c147eb6e82565c911331d Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 27 May 2013 12:49:31 -0700 Subject: [PATCH 2/5] add etcd and etcd-client to coreos.ebuild --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index d43f743182..2eb1970c18 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -148,6 +148,8 @@ RDEPEND="${RDEPEND} sys-apps/systemd sys-apps/systemd-sysv-utils app-admin/systemd-rest + app-admin/etcd + app-admin/etcd-client coreos-base/motd-http coreos-base/crosh sys-apps/util-linux From 5bdfe8d16964ad3167eb13d7ef643f2da1c85a52 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 27 May 2013 13:08:05 -0700 Subject: [PATCH 3/5] add copyright and remove service file --- .../app-admin/etcd-client/etcd-client-9999.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild index ba5240756c..8f22ddb76e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild @@ -1,5 +1,6 @@ # # 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:$ # @@ -29,8 +30,6 @@ src_compile() { } src_install() { - dosbin ${S}/etcd-client - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_enable_service multi-user.target ${PN}.service + dobin ${S}/etcd-client } From 37f3b35b32403789a751a28dd40a570b611c9a79 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 27 May 2013 13:08:50 -0700 Subject: [PATCH 4/5] add copyright and remove service file --- .../app-admin/etcd-client/files/etcd-client.service | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/files/etcd-client.service diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/files/etcd-client.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/files/etcd-client.service deleted file mode 100644 index 9ee6b64e36..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/files/etcd-client.service +++ /dev/null @@ -1,5 +0,0 @@ -[Service] -ExecStart=/usr/sbin/etcd-client - -[Install] -WantedBy=multi-user.target From 84e079a722b37b8f7490143b18ab951aca73f0d4 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 27 May 2013 13:11:00 -0700 Subject: [PATCH 5/5] add copyright --- .../third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild index 00906dc85b..7080eab12c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild @@ -1,5 +1,6 @@ # # 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:$ #