From 1d9b0523c70bb076e471fb8caf026ac2471759ff Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 20 May 2015 10:45:41 -0700 Subject: [PATCH] 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" }