From eff7ed1aa2c1e8e3c16722f795b6fefa8c6fb4ef Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 01/18] dev-lang/go-bootstrap: Add Gentoo bug number Signed-off-by: Geoff Levand --- .../dev-lang/go-bootstrap/go-bootstrap-1.4.2-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/go-bootstrap-1.4.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/go-bootstrap-1.4.2-r1.ebuild index b6b22316dd..68ca142fc9 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/go-bootstrap-1.4.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/go-bootstrap-1.4.2-r1.ebuild @@ -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 } From a34c97f748265a8ec6a7de7d8341396d2b23d188 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 02/18] eclass/coreos-go.eclass: Fix GOPATH usage We currenly use ${GOPATH}/bin as the path for the compiler generated executable, but this usage does not allow ebuilds to add additional local paths to GOPATH. To allow for this usage, change the invocation of the compiler to use ${GOBIN}. Signed-off-by: Geoff Levand --- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index b2b03adb27..e5a5b27a50 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -32,7 +32,7 @@ go_build() { 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" } From b4343c1f69d9c10d66ffa4c872ed6171127c1ce0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 03/18] eclass/coreos-go: Fix typo in error message. Signed-off-by: Geoff Levand --- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index e5a5b27a50..10b4bc5e41 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -26,7 +26,7 @@ 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##*/}" From 97e97a0ce626c8e76b3f5bac38c6108c3a6b4bdb Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 04/18] eclass/coreos-go: Add debug-print statements Add debug-print statements for the values of GOARCH, GOPATH, and GOBIN. Signed-off-by: Geoff Levand --- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index 10b4bc5e41..90de14f636 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -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 From 98c9080c9d8c1a5fa9eb994df16311e04679bc64 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 05/18] eclass/coreos-go: Conditional CGO_ENABLED assigment To allow ebuilds to set CGO_ENABLED. Signed-off-by: Geoff Levand --- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index 90de14f636..3aab6ce0c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -64,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}" From 3fc130c75ad268b584a524e23da65d8a1dbac1c7 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 06/18] app-admin/sdnotify-proxy: Minor ebuild cleanups Signed-off-by: Geoff Levand --- .../app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild index c41bf27495..dfa19ee569 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild @@ -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 } From c3f77cb2a91bc4de80cf58971df653fad0d66690 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 07/18] app-emulation/actool: Update for arm64 Signed-off-by: Geoff Levand --- .../coreos-overlay/app-emulation/actool/actool-9999.ebuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-9999.ebuild index 9e2e568caf..4b11b10ef1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-9999.ebuild @@ -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" } From ef60214b2994efcd105b83ffaa6f9b52b2fe72ca Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 08/18] dev-db/etcd: Update for arm64 Signed-off-by: Geoff Levand --- .../third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 ebc21fcd3e..f895b653b4 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 @@ -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" From 529ef1aae031874be61f108e99d0cf9bb7e4060f Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 09/18] dev-util/go-bindata: Update for arm64 Add arm64 keywords and remove redundant DEPENDS. Signed-off-by: Geoff Levand --- ...{go-bindata-3.0.5-r1.ebuild => go-bindata-3.0.5-r2.ebuild} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/{go-bindata-3.0.5-r1.ebuild => go-bindata-3.0.5-r2.ebuild} (92%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r2.ebuild similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r2.ebuild index 3b22ce2755..7362f0cc53 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r2.ebuild @@ -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 From 1d9b0523c70bb076e471fb8caf026ac2471759ff Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 10/18] coreos-base/coretest: Update for arm64 Add arm64 keywords and convert to coreos-go eclass. Signed-off-by: Geoff Levand --- ...1-r16.ebuild => coretest-0.0.1-r17.ebuild} | 0 .../coreos-base/coretest/coretest-9999.ebuild | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/{coretest-0.0.1-r16.ebuild => coretest-0.0.1-r17.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r17.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r16.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r17.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild index 9d5a60fcde..317f9b3551 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild @@ -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" } From 71f9fe17798f75a349e2397a00c3e4cd87cf71b6 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 11/18] coreos/coreos-cloudinit: Update for arm64 Convert to coreos-go eclass and add arm64 keywords. Signed-off-by: Geoff Levand --- .../coreos-cloudinit-9999.ebuild | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index 0e4ebfd620..6e3288c010 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -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 - ! Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 12/18] coreos-base/nova-agent-watcher: Update for arm64 Add arm64 keywords and convert to coreos-go eclass. Signed-off-by: Geoff Levand --- .../nova-agent-watcher-9999.ebuild | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild index 7d84c96fa9..b16d2d7028 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild @@ -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 } From 59d2d9fdddd863739b622dcf08ce79b3caedf9b0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH 13/18] app-admin/fleet: Update for arm64 Convert to coreos-go eclass and add arm64 keywords. Signed-off-by: Geoff Levand --- .../app-admin/fleet/fleet-9999.ebuild | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild index 4e5282c10f..dec1444e42 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild @@ -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 From 339a91cdabe74fe5136c2a92176f3dae27817b29 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:42 -0700 Subject: [PATCH 14/18] app-admin/locksmith: Update for arm64 Convert to coreos-go eclass and add arm64 keywords. Also remove the setting of -fno-PIC. Signed-off-by: Geoff Levand --- .../app-admin/locksmith/locksmith-9999.ebuild | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild index 417e5104ed..05a1664139 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild @@ -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 From fe996a59d897b653d9d2daea70491081b3f67d88 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:42 -0700 Subject: [PATCH 15/18] app-admin/mayday: Update for arm64 Cleanup coreos-go eclass and add arm64 keywords. Signed-off-by: Geoff Levand --- .../coreos-overlay/app-admin/mayday/mayday-9999.ebuild | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild index 630e4a9af0..50a62f227d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild @@ -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 } From 33ba81838ee11dddcd526bb8a67df381ba2252ee Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:42 -0700 Subject: [PATCH 16/18] app-admin/updateservicectl: Update for arm64 Convert to coreos-go eclass and add arm64 keywords. Signed-off-by: Geoff Levand --- .../updateservicectl-9999.ebuild | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild index b0071c21e9..330d832fe4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild @@ -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" } From 641316b69534f9ff59303075e998ad1fb67088af Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:42 -0700 Subject: [PATCH 17/18] sys-apps/ignition: Update for arm64 Cleanup coreos-go eclass and add arm64 keywords. Signed-off-by: Geoff Levand --- .../sys-apps/ignition/ignition-9999.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 3d463e9f54..41c6befb71 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -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 From f36654e1c94035de71db4ae765183a5d096f3a6b Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:42 -0700 Subject: [PATCH 18/18] coreos-devel/mantle: Update for arm64 Cleanup ebuild and add arm64 keywords. Signed-off-by: Geoff Levand --- .../coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild index 0c645f7051..da422988a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild @@ -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