From 71eb9655b84a5234644d9c6f6611894238e00b7d Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 17 Mar 2015 23:31:19 -0700 Subject: [PATCH 1/2] dev-db/etcd: bump to v2.0.5 --- .../dev-db/etcd/{etcd-2.0.4-r1.ebuild => etcd-2.0.5.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.4-r1.ebuild => etcd-2.0.5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.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 a149b478af..b459bcbb6b 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 systemd if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="1a2c6d3f2fbcb047712bfa3234bff5b9d07bdc57" # v2.0.4 + CROS_WORKON_COMMIT="9481945228b97c5d019596b921d8b03833964d9e" # v2.0.5 KEYWORDS="amd64" fi From 0a7ab5081928d4fd74f29a334f85bf65a319f576 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 17 Mar 2015 23:09:45 -0700 Subject: [PATCH 2/2] profiles: enable etcd protocols 1 and 2 --- .../coreos-overlay/profiles/coreos/base/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 260c89a170..67f6d2c322 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -13,7 +13,7 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" # via use flags because if two versions are installed one must provide # the "default" /usr/bin/etcd binary and systemd services. USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS" -ETCD_PROTOCOLS="1" +ETCD_PROTOCOLS="1 2" # Extra use flags for CoreOS SDK USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb"