From af7492548134728e9154015a64e549b0056db8da Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 21 Aug 2017 14:25:06 -0700 Subject: [PATCH] coreos-base/coreos: use etcdctl v3 See the two previous commit messages for more details. See also https://github.com/coreos/bugs/issues/1717 --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + .../coreos-overlay/profiles/coreos/base/package.use | 4 ++++ 2 files changed, 5 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 b21c45bd8b..48ee0688e0 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 @@ -112,6 +112,7 @@ RDEPEND="${RDEPEND} coreos-base/coreos-metadata coreos-base/update_engine dev-db/etcd:2 + dev-db/etcdctl dev-util/strace dev-vcs/git net-analyzer/nmap 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 3e59530234..10ac33cbb7 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 @@ -95,3 +95,7 @@ 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