diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r251.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r252.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r251.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r252.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 3bc6b9080a..24c981e487 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 @@ -109,7 +109,6 @@ 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-starter/etcd-starter-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.3.ebuild deleted file mode 120000 index 566b178428..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.3.ebuild +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 54e4079efd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# -# 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="92b66f1e4c02d44a95eb51ea0e449bd6221f6b49" # v0.0.3 - 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 deleted file mode 100644 index 721e9c9161..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/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-starter/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service deleted file mode 100644 index 4d12c4bcbb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/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