From 3f648efc73be4f5be0b514b0c268a218bfb70dac Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Jan 2018 10:45:56 -0800 Subject: [PATCH] dev-db/etcd: drop package --- .../dev-db/etcd/etcd-2.3.8-r2.ebuild | 1 - .../dev-db/etcd/etcd-9999.ebuild | 48 ------------------- .../etcd-2.3.8-fix-pointless-breakage.patch | 10 ---- .../dev-db/etcd/files/etcd2.conf | 1 - .../dev-db/etcd/files/etcd2.service | 17 ------- .../coreos-overlay/dev-db/etcd/metadata.xml | 4 -- .../profiles/coreos/base/package.use | 4 -- 7 files changed, 85 deletions(-) delete mode 120000 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8-r2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8-r2.ebuild deleted file mode 120000 index f972b32dc1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8-r2.ebuild +++ /dev/null @@ -1 +0,0 @@ -etcd-9999.ebuild \ No newline at end of file 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 deleted file mode 100644 index ec65379d39..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2015 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -CROS_WORKON_PROJECT="coreos/etcd" -CROS_WORKON_LOCALNAME="etcd" -CROS_WORKON_REPO="git://github.com" -COREOS_GO_PACKAGE="github.com/coreos/etcd" -COREOS_GO_VERSION="go1.7" -inherit coreos-go toolchain-funcs cros-workon systemd - -if [[ "${PV}" == 9999 ]]; then - CROS_WORKON_COMMIT=${CROS_WORKON_COMMIT:="HEAD"} - KEYWORDS="~amd64 ~arm64" -else - CROS_WORKON_COMMIT="7e4fc7eaa931298732c880a703bccc9c177ae1de" # v2.3.8 - KEYWORDS="amd64 arm64" -fi - -DESCRIPTION="etcd" -HOMEPAGE="https://github.com/coreos/etcd" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="2" -IUSE="+etcdctl" - -RDEPEND="!dev-db/etcd:0 - etcdctl? ( !dev-db/etcdctl )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.3.8-fix-pointless-breakage.patch" - coreos-go_src_prepare "$@" -} - -src_compile() { - GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.GitSHA=${CROS_WORKON_COMMIT:0:7}" - go_build "${COREOS_GO_PACKAGE}" - use etcdctl && go_build "${COREOS_GO_PACKAGE}/etcdctl" -} - -src_install() { - use etcdctl && dobin ${WORKDIR}/gopath/bin/etcdctl - newbin "${WORKDIR}/gopath/bin/${PN}" "${PN}${SLOT}" - - systemd_dounit "${FILESDIR}/${PN}${SLOT}.service" - systemd_dotmpfilesd "${FILESDIR}/${PN}${SLOT}.conf" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch deleted file mode 100644 index c96e5e560c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- etcdmain/etcd.go -+++ etcdmain/etcd.go -@@ -555,6 +555,7 @@ - } - - func checkSupportArch() { -+ return - // TODO qualify arm64 - if runtime.GOARCH == "amd64" { - return diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf deleted file mode 100644 index d8bfc78710..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/etcd2 0755 etcd etcd - - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service deleted file mode 100644 index 288a0db973..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=etcd2 -Conflicts=etcd.service - -[Service] -User=etcd -Type=notify -Environment=ETCD_DATA_DIR=/var/lib/etcd2 -Environment=ETCD_NAME=%m -ExecStart=/usr/bin/etcd2 -Restart=always -RestartSec=10s -LimitNOFILE=40000 -TimeoutStartSec=0 - -[Install] -WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index a829f6fc6c..7e3a5b1ad9 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -96,10 +96,6 @@ sys-apps/portage -xattr # Enable -M and -Z flags; -M is used by mayday sys-process/lsof rpc selinux -# Don't include etcd2's etcdctl so we can include the newer version via the -# etcdctl package -dev-db/etcd -etcdctl - # can be removed with socat-2.0.0; this is the openssl/readline license # incompatibility net-misc/socat -ssl