From 81a56614505547a771459a1ddc97d70317549570 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 20 Mar 2015 16:18:01 -0700 Subject: [PATCH 1/4] dev-db/etcd-starter: add etcd-starter --- .../etcd-starter/etcd-starter-0.0.2.ebuild | 1 + .../etcd-starter/etcd-starter-9999.ebuild | 51 +++++++++++++++++++ .../dev-db/etcd-starter/files/etcd.conf | 2 + .../dev-db/etcd-starter/files/etcd.service | 12 +++++ 4 files changed, 66 insertions(+) create mode 120000 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.2.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.2.ebuild new file mode 120000 index 0000000000..566b178428 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.2.ebuild @@ -0,0 +1 @@ +etcd-starter-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild new file mode 100644 index 0000000000..da4a921876 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild @@ -0,0 +1,51 @@ +# +# Copyright (c) 2014 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 +# $Header:$ +# + +EAPI=5 +CROS_WORKON_PROJECT="coreos/etcd-starter" +CROS_WORKON_LOCALNAME="etcd-starter" +CROS_WORKON_REPO="git://github.com" +COREOS_GO_PACKAGE="github.com/coreos/etcd-starter" +inherit coreos-go cros-workon systemd + +if [[ "${PV}" == 9999 ]]; then + KEYWORDS="~amd64" +else + CROS_WORKON_COMMIT="e6265b3a028225a8b57ddbfc3ad1992abc89974f" # v0.0.2 + KEYWORDS="amd64" +fi + +DESCRIPTION="etcd-starter" +HOMEPAGE="https://github.com/coreos/etcd-starter" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="etcd_protocols_1 etcd_protocols_2" + +REQUIRED_USE="|| ( etcd_protocols_1 etcd_protocols_2 )" + +DEPEND=">=dev-lang/go-1.2" + +src_compile() { + go_build "${COREOS_GO_PACKAGE}" +} + +src_install() { + local libexec="libexec/etcd/internal_versions" + + if use etcd_protocols_1 && use etcd_protocols_2; then + dobin "${WORKDIR}/gopath/bin/${PN}" + dosym "${PN}" /usr/bin/etcd + elif use etcd_protocols_1; then + dosym "../${libexec}/1/etcd" /usr/bin/etcd + elif use etcd_protocols_2; then + dosym "../${libexec}/2/etcd" /usr/bin/etcd + fi + + systemd_dounit "${FILESDIR}"/etcd.service + systemd_dotmpfilesd "${FILESDIR}"/etcd.conf +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf new file mode 100644 index 0000000000..721e9c9161 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf @@ -0,0 +1,2 @@ +d /var/lib/etcd 0755 etcd etcd - - +d /var/run/etcd 0755 etcd etcd - - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service new file mode 100644 index 0000000000..4d12c4bcbb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service @@ -0,0 +1,12 @@ +[Unit] +Description=etcd + +[Service] +User=etcd +PermissionsStartOnly=true +Environment=ETCD_DATA_DIR=/var/lib/etcd +Environment=ETCD_NAME=%m +ExecStart=/usr/bin/etcd +Restart=always +RestartSec=10s +LimitNOFILE=40000 From a1487bc1a684e14e386f2092c3c19517a2da1d38 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 20 Mar 2015 16:17:06 -0700 Subject: [PATCH 2/4] dev-db/etcd: use etcd-starter --- ...1-r248.ebuild => coreos-0.0.1-r249.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 3 ++- ...d-0.4.7-r2.ebuild => etcd-0.4.7-r3.ebuild} | 23 ++++--------------- ...etcd-2.0.5.ebuild => etcd-2.0.5-r1.ebuild} | 0 .../dev-db/etcd/etcd-9999.ebuild | 10 +++----- .../dev-db/etcd/files/etcd.conf | 2 -- .../dev-db/etcd/files/etcd.service | 12 ---------- 7 files changed, 9 insertions(+), 41 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r248.ebuild => coreos-0.0.1-r249.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.4.7-r2.ebuild => etcd-0.4.7-r3.ebuild} (50%) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-2.0.5.ebuild => etcd-2.0.5-r1.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r248.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r249.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r248.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r249.ebuild 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 b8d7b89a8a..c18192d844 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 @@ -81,7 +81,7 @@ RDEPEND="${RDEPEND} # implementation based on whether protocol 2 is enabled or not. RDEPEND="${RDEPEND} etcd_protocols_1? ( - dev-db/etcd:1[etcd_protocols_2=] + dev-db/etcd:1 !etcd_protocols_2? ( dev-db/etcdctl ) ) etcd_protocols_2? ( dev-db/etcd:2 ) @@ -108,6 +108,7 @@ RDEPEND="${RDEPEND} coreos-base/coreos-init coreos-base/coreos-cloudinit coreos-base/coretest + dev-db/etcd-starter net-analyzer/nmap net-firewall/ebtables net-firewall/ipset diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild similarity index 50% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild index 7411e7b354..ffa3b6eef7 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild @@ -8,7 +8,7 @@ EAPI=4 CROS_WORKON_PROJECT="coreos/etcd" CROS_WORKON_LOCALNAME="etcd" CROS_WORKON_REPO="git://github.com" -inherit coreos-doc toolchain-funcs cros-workon systemd +inherit coreos-doc toolchain-funcs cros-workon if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" @@ -23,32 +23,17 @@ SRC_URI="" LICENSE="Apache-2.0" SLOT="1" -IUSE="etcd_protocols_1 etcd_protocols_2" - -# Sanity check that this version is indeed wanted! -REQUIRED_USE="etcd_protocols_${SLOT}" DEPEND=">=dev-lang/go-1.2" -RDEPEND="!dev-db/etcd:0 - !etcd_protocols_2? ( !dev-db/etcd:2 )" +RDEPEND="!dev-db/etcd:0" src_compile() { ./build } src_install() { - local libexec="libexec/${PN}/internal_versions" + local libexec="libexec/${PN}/internal_versions/${SLOT}" exeinto "/usr/${libexec}" - newexe "${S}/bin/${PN}" ${SLOT} - - # protocol1 is default if protocol2 is disabled - if ! use etcd_protocols_2; then - dosym "../${libexec}/${SLOT}" /usr/bin/${PN} - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf - - coreos-dodoc -r Documentation/* - fi + doexe "${S}/bin/${PN}" } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild index b459bcbb6b..30d7faeef4 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_PROJECT="coreos/etcd" CROS_WORKON_LOCALNAME="etcd" CROS_WORKON_REPO="git://github.com" COREOS_GO_PACKAGE="github.com/coreos/etcd" -inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd +inherit coreos-doc coreos-go toolchain-funcs cros-workon if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" @@ -38,18 +38,14 @@ src_compile() { } src_install() { - local libexec="libexec/${PN}/internal_versions" + local libexec="libexec/${PN}/internal_versions/${SLOT}" dobin ${WORKDIR}/gopath/bin/etcdctl dobin ${WORKDIR}/gopath/bin/etcd-migrate dobin ${WORKDIR}/gopath/bin/etcd-dump-logs exeinto "/usr/${libexec}" - newexe "${WORKDIR}/gopath/bin/${PN}" ${SLOT} - dosym "../${libexec}/${SLOT}" /usr/bin/${PN} - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf + doexe "${WORKDIR}/gopath/bin/${PN}" coreos-dodoc -r Documentation/* } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf deleted file mode 100644 index 721e9c9161..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /var/lib/etcd 0755 etcd etcd - - -d /var/run/etcd 0755 etcd etcd - - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service deleted file mode 100644 index 4d12c4bcbb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=etcd - -[Service] -User=etcd -PermissionsStartOnly=true -Environment=ETCD_DATA_DIR=/var/lib/etcd -Environment=ETCD_NAME=%m -ExecStart=/usr/bin/etcd -Restart=always -RestartSec=10s -LimitNOFILE=40000 From 64fad4ab0149f4bfc523402a4f1be10b4f220d06 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 23 Mar 2015 14:03:13 -0700 Subject: [PATCH 3/4] dev-db/etcd: bump 0.4.7 to 0.4.8 --- .../dev-db/etcd/{etcd-0.4.7-r3.ebuild => etcd-0.4.8.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.4.7-r3.ebuild => etcd-0.4.8.ebuild} (90%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.8.ebuild similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.8.ebuild index ffa3b6eef7..c09cffcb3e 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.8.ebuild @@ -13,7 +13,7 @@ inherit coreos-doc toolchain-funcs cros-workon if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="d6523fe4638100c72f40cb282cd1232db13f7336" # v0.4.7 + CROS_WORKON_COMMIT="2f6ea0a0e5a6854d2d0f79bf0d1bb87dde649071" # v0.4.8 KEYWORDS="amd64" fi From aabcd58fad06b71ec2d18ca014c99473f629051f Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 23 Mar 2015 14:19:12 -0700 Subject: [PATCH 4/4] dev-db/etcd: bump 2.0.5 to 2.0.6 --- .../dev-db/etcd/{etcd-2.0.5-r1.ebuild => etcd-2.0.6.ebuild} | 0 .../src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-2.0.5-r1.ebuild => etcd-2.0.6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild index 30d7faeef4..9d3de4e89e 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild @@ -14,7 +14,7 @@ inherit coreos-doc coreos-go toolchain-funcs cros-workon if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="9481945228b97c5d019596b921d8b03833964d9e" # v2.0.5 + CROS_WORKON_COMMIT="e3c902228b1fefa8158583e167ae552622a24367" # v2.0.6 KEYWORDS="amd64" fi