Merge pull request #342 from bcwaldon/etcd-v0.3.0

Bump etcd to v0.3.0
This commit is contained in:
Michael Marineau 2014-02-09 14:56:05 -08:00
commit cad87aa47a
9 changed files with 10 additions and 121 deletions

View File

@ -1,36 +0,0 @@
#
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
# $Header:$
#
EAPI=2
CROS_WORKON_PROJECT="coreos/etcd-client"
CROS_WORKON_LOCALNAME="etcd-client"
CROS_WORKON_REPO="git://github.com"
CROS_WORKON_COMMIT="350501cefd98d7d816efaf7c650ad49c6c3dbc89"
inherit toolchain-funcs cros-workon systemd
DESCRIPTION="etcd-client"
HOMEPAGE="https://github.com/xiangli-cmu/etcd-client"
SRC_URI=""
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 arm x86"
IUSE=""
DEPEND=">=dev-lang/go-1.0.2"
GOROOT="${ED}usr/$(get_libdir)/go"
GOPKG="${PN}"
src_compile() {
export GOPATH="${S}"
go get
go build -o ${PN} || die
}
src_install() {
dobin ${S}/${PN} || die
}

View File

@ -1,35 +0,0 @@
#
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
# $Header:$
#
EAPI=2
CROS_WORKON_PROJECT="coreos/etcd-client"
CROS_WORKON_LOCALNAME="etcd-client"
CROS_WORKON_REPO="git://github.com"
inherit toolchain-funcs cros-workon systemd
DESCRIPTION="etcd-client"
HOMEPAGE="https://github.com/xiangli-cmu/etcd-client"
SRC_URI=""
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
DEPEND=">=dev-lang/go-1.0.2"
GOROOT="${ED}usr/$(get_libdir)/go"
GOPKG="${PN}"
src_compile() {
export GOPATH="${S}"
go get
go build -o ${PN} || die
}
src_install() {
dobin ${S}/${PN} || die
}

View File

@ -1 +0,0 @@
etcd-lib-0.0.1.ebuild

View File

@ -1,38 +0,0 @@
#
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
# $Header:$
#
EAPI=2
EGIT_REPO_SERVER="https://bitbucket.org"
EGIT_REPO_URI="${EGIT_REPO_SERVER}/coreos/etcd-lib.git"
EGIT_BRANCHEGIT_BRANCH="master"
inherit git systemd
DESCRIPTION="Experiments in using etcd"
HOMEPAGE="https://bitbucket.org/coreos/etcd-libs"
SRC_URI=""
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 arm x86"
IUSE=""
# TODO, use cros
#CROS_WORKON_PROJECT="coreos/etcd-libs"
#CROS_WORKON_LOCALNAME="etcd-libs"
#CROS_WORKON_REPO="https://bitbucket.org"
#inherit toolchain-funcs cros-workon systemd
src_install() {
systemd_dounit "${S}"/etcd@.service
dodir /usr/lib/etcd/
insinto /usr/lib/etcd/
cp -Ra "${S}"/* ${D}/usr/lib/etcd/
dodir /var/lib/containers
dodir /var/lib/systemd-rest
}

View File

@ -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"
@ -21,14 +21,14 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=dev-lang/go-1.1"
DEPEND=">=dev-lang/go-1.2"
src_compile() {
./build
}
src_install() {
dobin ${S}/${PN}
dobin ${S}/bin/${PN}
dobin ${FILESDIR}/etcd-bootstrap
dobin ${FILESDIR}/etcd-pre-exec

View File

@ -20,14 +20,14 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
DEPEND=">=dev-lang/go-1.1"
DEPEND=">=dev-lang/go-1.2"
src_compile() {
./build
}
src_install() {
dobin ${S}/${PN}
dobin ${S}/bin/${PN}
dobin ${FILESDIR}/etcd-bootstrap
dobin ${FILESDIR}/etcd-pre-exec

View File

@ -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
@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="amd64"
IUSE=""
DEPEND=">=dev-lang/go-1.1"
DEPEND=">=dev-lang/go-1.2"
RDEPEND=""
src_compile() {
@ -26,5 +26,5 @@ src_compile() {
}
src_install() {
dobin ${S}/${PN}
dobin ${S}/bin/${PN}
}

View File

@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
DEPEND=">=dev-lang/go-1.1"
DEPEND=">=dev-lang/go-1.2"
RDEPEND=""
src_compile() {
@ -25,5 +25,5 @@ src_compile() {
}
src_install() {
dobin ${S}/${PN}
dobin ${S}/bin/${PN}
}