Merge pull request #1261 from glevand/for-merge-1

Update go program ebuilds for arm64
This commit is contained in:
Michael Marineau 2015-05-20 14:57:36 -07:00
commit 40d1c97b76
16 changed files with 73 additions and 106 deletions

View File

@ -1,20 +1,20 @@
# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=5
CROS_WORKON_PROJECT="coreos/fleet"
CROS_WORKON_LOCALNAME="fleet"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/fleet"
inherit coreos-doc cros-workon coreos-go systemd
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="dc1d8e82dc07151297d8a2396dcf52e703d48f20" # tag v0.10.1
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
inherit coreos-doc cros-workon systemd
DESCRIPTION="fleet"
HOMEPAGE="https://github.com/coreos/fleet"
SRC_URI=""
@ -23,18 +23,15 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.3"
src_compile() {
./build || die
go_build "${COREOS_GO_PACKAGE}/fleetd"
go_build "${COREOS_GO_PACKAGE}/fleetctl"
}
src_install() {
dobin ${S}/bin/fleetd
dobin ${GOBIN}/*
dosym ./fleetd /usr/bin/fleet
dobin ${S}/bin/fleetctl
systemd_dounit "${FILESDIR}"/${PN}.service
systemd_dounit "${FILESDIR}"/${PN}.socket

View File

@ -1,20 +1,20 @@
# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=5
CROS_WORKON_PROJECT="coreos/locksmith"
CROS_WORKON_LOCALNAME="locksmith"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/locksmith"
inherit cros-workon systemd coreos-go
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="bee1358eb3a65387333ee3adc8a3fdfc0feac656" # v0.3.0 git tag
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
inherit cros-workon systemd
DESCRIPTION="locksmith"
HOMEPAGE="https://github.com/coreos/locksmith"
SRC_URI=""
@ -23,20 +23,12 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.2"
src_compile() {
# work around gentoo hardened gcc incompatibilities with cgo
# see https://bugs.gentoo.org/show_bug.cgi?id=493328
if gcc-specs-pie; then
GOLDFLAGS="-extldflags -fno-PIC"
fi
GOLDFLAGS=${GOLDFLAGS} ./build || die
go_build "${COREOS_GO_PACKAGE}/locksmithctl"
}
src_install() {
dobin ${S}/bin/locksmithctl
dobin ${GOBIN}/locksmithctl
dodir /usr/lib/locksmith
dosym ../../../bin/locksmithctl /usr/lib/locksmith/locksmithd

View File

@ -12,10 +12,10 @@ COREOS_GO_PACKAGE="github.com/coreos/mayday"
inherit coreos-go cros-workon
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="eaff09119f3a5b911908e4d3200272034466fe5d" # v0.1.0
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
DESCRIPTION="mayday"
@ -26,13 +26,11 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.2"
src_compile() {
go_build "${COREOS_GO_PACKAGE}/cmd"
}
src_install() {
newbin ${WORKDIR}/gopath/bin/cmd mayday
newbin ${GOBIN}/cmd mayday
}

View File

@ -23,13 +23,8 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.3"
src_compile() {
go_build "${COREOS_GO_PACKAGE}"
}
src_install() {
# Put sdnotify-proxy into its well-know location.
exeinto /usr/libexec
doexe ${GOBIN}/sdnotify-proxy
}

View File

@ -5,16 +5,16 @@ EAPI=5
CROS_WORKON_PROJECT="coreos/updateservicectl"
CROS_WORKON_LOCALNAME="updateservicectl"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/updateservicectl"
inherit cros-workon coreos-go
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="f9a7976a09697a15c41a1affb4866790ef714332" # tag v1.3.0
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
inherit cros-workon
DESCRIPTION="CoreUpdate Management CLI"
HOMEPAGE="https://github.com/coreos/updateservicectl"
SRC_URI=""
@ -23,13 +23,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.2"
RDEPEND="!app-admin/updatectl"
src_compile() {
./build || die
}
src_install() {
dobin bin/updateservicectl
src_prepare() {
coreos-go_src_prepare
GOPATH+=":${S}/Godeps/_workspace"
}

View File

@ -4,16 +4,15 @@
EAPI=5
CROS_WORKON_PROJECT="appc/spec"
CROS_WORKON_REPO="git://github.com"
# name of directory git repo is checked out into by manifest
CROS_WORKON_LOCALNAME="appc-spec"
COREOS_GO_PACKAGE="github.com/appc/spec"
inherit coreos-go cros-workon
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="9a448f73b7fa765a60eade4bcca41e18bfe613aa" # v0.5.1
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
DESCRIPTION="App Container builder and validator"
@ -24,8 +23,6 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.3"
src_compile() {
go_build "${COREOS_GO_PACKAGE}/actool"
}

View File

@ -1,20 +1,20 @@
# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=5
CROS_WORKON_PROJECT="coreos/coreos-cloudinit"
CROS_WORKON_LOCALNAME="coreos-cloudinit"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/coreos-cloudinit"
inherit coreos-doc cros-workon systemd toolchain-funcs udev coreos-go
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="ca6f97d050bb51ae37aa1d91996e7fb6a66687c4" # tag v1.4.1
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
inherit coreos-doc cros-workon systemd toolchain-funcs udev
DESCRIPTION="coreos-cloudinit"
HOMEPAGE="https://github.com/coreos/coreos-cloudinit"
SRC_URI=""
@ -23,27 +23,23 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.2
!<coreos-base/coreos-init-0.0.1-r69"
DEPEND="!<coreos-base/coreos-init-0.0.1-r69"
RDEPEND="
>=sys-apps/shadow-4.1.5.1
"
src_compile() {
# setup CFLAGS and LDFLAGS for separate build target
export CGO_CFLAGS="-I${ROOT}/usr/include"
export CGO_LDFLAGS="-L${ROOT}/usr/lib"
src_prepare() {
coreos-go_src_prepare
GOPATH+=":${S}/third_party"
if gcc-specs-pie; then
CGO_LDFLAGS+=" -fno-PIC"
fi
./build || die
}
src_install() {
dobin ${S}/bin/coreos-cloudinit
dobin ${GOBIN}/coreos-cloudinit
udev_dorules units/*.rules
systemd_dounit units/*.mount
systemd_dounit units/*.path

View File

@ -5,16 +5,16 @@ EAPI=5
CROS_WORKON_PROJECT="coreos/coretest"
CROS_WORKON_LOCALNAME="coretest"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/coretest"
inherit cros-workon coreos-go
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="~amd64 ~arm64 ~x86"
else
CROS_WORKON_COMMIT="7ddccba648523fd041c0f729bcaec48c6e253c1a"
KEYWORDS="amd64 arm x86"
KEYWORDS="amd64 arm64 x86"
fi
inherit cros-workon
DESCRIPTION="Sanity tests for CoreOS"
HOMEPAGE="https://github.com/coreos/coretest"
SRC_URI=""
@ -23,12 +23,13 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.1"
src_compile() {
./build || die
src_prepare() {
coreos-go_src_prepare
GOPATH+=":${S}/third_party"
}
src_install() {
dobin "${S}/${PN}"
go test -i -c -o "${GOBIN}/coretest" "github.com/coreos/coretest" \
|| die "go test failed"
dobin "${GOBIN}/coretest"
}

View File

@ -1,20 +1,20 @@
# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=5
CROS_WORKON_PROJECT="coreos/nova-agent-watcher"
CROS_WORKON_LOCALNAME="nova-agent-watcher"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/nova-agent-watcher"
inherit cros-workon systemd coreos-go
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="2262401fe363cfdcc4c6f02144622466d506de43"
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
inherit cros-workon systemd
DESCRIPTION="nova-agent-watcher"
HOMEPAGE="https://github.com/coreos/nova-agent-watcher"
SRC_URI=""
@ -23,14 +23,8 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.2"
src_compile() {
./build || die
}
src_install() {
into "/usr/share/oem"
dobin ${S}/scripts/gentoo-to-networkd
dobin ${S}/bin/nova-agent-watcher
dobin ${GOBIN}/nova-agent-watcher
}

View File

@ -3,14 +3,15 @@
EAPI=5
CROS_WORKON_PROJECT="coreos/mantle"
CROS_WORKON_LOCALNAME="mantle"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/mantle"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="47fb7ad56a42e336546742258513fb1344f0105c"
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
inherit coreos-go cros-workon

View File

@ -12,10 +12,10 @@ COREOS_GO_PACKAGE="github.com/coreos/etcd"
inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="0678329cd64a64d7478eae6c35ed0bea0346da86" # v2.0.11
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"
fi
DESCRIPTION="etcd"
@ -26,7 +26,6 @@ LICENSE="Apache-2.0"
SLOT="2"
IUSE=""
DEPEND=">=dev-lang/go-1.3"
RDEPEND="!dev-db/etcd:0
!dev-db/etcdctl"

View File

@ -37,6 +37,7 @@ src_prepare()
sed -i -e 's/"-Werror",//g' src/cmd/dist/build.c
# Fix-up for dev-lang/go file collisions when FEATURES=splitdebug.
# https://bugs.gentoo.org/show_bug.cgi?id=549598
rm src/debug/dwarf/testdata/typedef.elf
}

View File

@ -15,9 +15,7 @@ EGIT_COMMIT="4a8e91e5cd96381a2d96bfa7541e63a81f7a3784"
LICENSE="CC0 1.0 Universal"
SLOT="0"
KEYWORDS="amd64 ~x86"
DEPEND="dev-lang/go"
KEYWORDS="amd64 arm64 ~x86"
src_compile() {
go_build "${COREOS_GO_PACKAGE}"/go-bindata

View File

@ -26,13 +26,13 @@ go_get_arch() {
go_build() {
debug-print-function ${FUNCNAME} "$@"
[[ $# -eq 0 || $# -gt 2 ]] && die "${ECLASS}: go_install: incorrect # of arguments"
[[ $# -eq 0 || $# -gt 2 ]] && die "${ECLASS}: ${FUNCNAME}: incorrect # of arguments"
local package_name="$1"
local binary_name="${package_name##*/}"
go build -x -p "$(makeopts_jobs)" \
-ldflags "${GO_LDFLAGS} -extldflags '${LDFLAGS}'" \
-o "${GOPATH}/bin/${binary_name}" "${package_name}" \
-o "${GOBIN}/${binary_name}" "${package_name}" \
|| die "${ECLASS}: go build failed"
}
@ -42,6 +42,11 @@ coreos-go_src_prepare() {
export GOARCH=$(go_get_arch)
export GOPATH="${WORKDIR}/gopath"
export GOBIN="${GOPATH}/bin"
debug-print "${FUNCNAME}: GOARCH=${GOARCH}"
debug-print "${FUNCNAME}: GOPATH=${GOPATH}"
debug-print "${FUNCNAME}: GOBIN=${GOBIN}"
mkdir -p "${GOBIN}" || die "${ECLASS}: bad path: ${GOBIN}"
if [[ -z "${COREOS_GO_PACKAGE}" ]]; then
@ -59,7 +64,7 @@ coreos-go_src_prepare() {
fi
export CC=$(tc-getCC)
export CGO_ENABLED=1
export CGO_ENABLED=${CGO_ENABLED:-1}
export CGO_CFLAGS="${CFLAGS}"
export CGO_CPPFLAGS="${CPPFLAGS}"
export CGO_CXXFLAGS="${CXXFLAGS}"

View File

@ -7,7 +7,7 @@ CROS_WORKON_LOCALNAME="ignition"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/ignition"
KEYWORDS="~amd64"
KEYWORDS="~amd64 arm64"
inherit coreos-doc coreos-go cros-workon systemd
@ -19,15 +19,12 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=">=dev-lang/go-1.2"
RDEPEND=""
src_compile() {
go_build "${COREOS_GO_PACKAGE}"
go_build "${COREOS_GO_PACKAGE}/src"
}
src_install() {
dobin "${S}/bin/${PN}"
dobin ${GOBIN}/*
systemd_dounit "${FILESDIR}"/coreos-metadata.target