From 29be341cff9a5afcb5172f17f50a627fbadc5130 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 7 Jan 2016 14:57:09 -0800 Subject: [PATCH 1/2] coreos-devel/mantle: install kolet binary to where kola expects it --- .../{mantle-0.0.7.ebuild => mantle-0.0.7-r1.ebuild} | 0 .../coreos-devel/mantle/mantle-9999.ebuild | 10 ++++++++++ 2 files changed, 10 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/{mantle-0.0.7.ebuild => mantle-0.0.7-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.7-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.7.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.7-r1.ebuild 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 6f3077bfc6..6d177677b3 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 @@ -28,3 +28,13 @@ src_compile() { go_build "${COREOS_GO_PACKAGE}/cmd/${cmd}" done } + +src_install() { + for cmd in cork kola ore plume; do + dobin "${GOBIN}"/"${cmd}" + done + + exeinto /usr/lib/kola/"$(go_get_arch)" + doexe "${GOBIN}"/kolet +} + From 6f45c13c1ce270ae2ff38677b21274c168c633a9 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 7 Jan 2016 14:58:15 -0800 Subject: [PATCH 2/2] coreos-devel/mantle: include fix for core user in sdk --- .../mantle/{mantle-0.0.7-r1.ebuild => mantle-0.0.8.ebuild} | 0 .../coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/{mantle-0.0.7-r1.ebuild => mantle-0.0.8.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.7-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.8.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.7-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.8.ebuild 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 6d177677b3..b273240f46 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 @@ -10,7 +10,7 @@ COREOS_GO_PACKAGE="github.com/coreos/mantle" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="969fa17a8fc904b05ab45e15f8937a0e5a5e9866" + CROS_WORKON_COMMIT="ba5d6cd46eb6ec14a73f537902a1ac8f8776faad" KEYWORDS="amd64 arm64" fi