From 95ee11f368a5eef033f99b0cb1d836ccf093d9f4 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Fri, 7 Feb 2014 19:04:22 -0800 Subject: [PATCH] bump(etcd): Upgrade etcd and etcdctl to v0.3.0 Additionally, use the correct bin-path to pull in the etcd and etcdctl binaries. --- .../dev-db/etcd/{etcd-0.2.0.ebuild => etcd-0.3.0.ebuild} | 4 ++-- .../third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild | 2 +- .../etcdctl/{etcdctl-0.2.0.ebuild => etcdctl-0.3.0.ebuild} | 4 ++-- .../coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.2.0.ebuild => etcd-0.3.0.ebuild} (88%) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/{etcdctl-0.2.0.ebuild => etcdctl-0.3.0.ebuild} (81%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild index 63e60df2cf..2196d17dec 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild @@ -9,7 +9,7 @@ EAPI=4 CROS_WORKON_PROJECT="coreos/etcd" CROS_WORKON_LOCALNAME="etcd" CROS_WORKON_REPO="git://github.com" -CROS_WORKON_COMMIT="5271378fc2c76f9c368f8ef96623d156888fbffa" # hash for tag v0.2.0 +CROS_WORKON_COMMIT="f9d27c37aa9bc12a51a6675e93cae454415aa3fa" # v0.3.0 tag inherit toolchain-funcs cros-workon systemd DESCRIPTION="etcd" @@ -28,7 +28,7 @@ src_compile() { } src_install() { - dobin ${S}/${PN} + dobin ${S}/bin/${PN} dobin ${FILESDIR}/etcd-bootstrap dobin ${FILESDIR}/etcd-pre-exec diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild index 9d6f87b8f2..15d65e830a 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild @@ -27,7 +27,7 @@ src_compile() { } src_install() { - dobin ${S}/${PN} + dobin ${S}/bin/${PN} dobin ${FILESDIR}/etcd-bootstrap dobin ${FILESDIR}/etcd-pre-exec diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild similarity index 81% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild index 4cca6ccafe..fbd6fa5200 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild @@ -5,7 +5,7 @@ EAPI=5 CROS_WORKON_PROJECT="coreos/etcdctl" CROS_WORKON_LOCALNAME="etcdctl" CROS_WORKON_REPO="git://github.com" -CROS_WORKON_COMMIT="ee096789193311aa6ea0717c8b31f4cf8c2dfe7d" # v0.2.0 tag + version flag +CROS_WORKON_COMMIT="54e8eaab737adcf887cf54d836cf91542f838fdc" # v0.3.0 tag inherit cros-workon @@ -26,5 +26,5 @@ src_compile() { } src_install() { - dobin ${S}/${PN} + dobin ${S}/bin/${PN} } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild index 61a9e64f63..3937971f3d 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild @@ -25,5 +25,5 @@ src_compile() { } src_install() { - dobin ${S}/${PN} + dobin ${S}/bin/${PN} }