From 1ecb32ac24dd43c1abc48c0bc54e2cd59c4f28ee Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 12 Mar 2015 15:32:42 -0700 Subject: [PATCH] rocket: bump to 0.4.1 Force cgo off for now, enabling cgo requires replacing the build script. --- .../rocket/{rocket-0.3.2-r2.ebuild => rocket-0.4.1.ebuild} | 0 .../coreos-overlay/app-emulation/rocket/rocket-9999.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/{rocket-0.3.2-r2.ebuild => rocket-0.4.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-0.3.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-0.4.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-0.3.2-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-0.4.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-9999.ebuild index cae743a158..d9a78bcd56 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-9999.ebuild @@ -10,7 +10,7 @@ inherit cros-workon if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="c94b5338411a3dbfb0d9cf62e9066fb837c1baae" # v0.3.2 + CROS_WORKON_COMMIT="258f946e3c85918e2dbf1920ae3c2bfe64ab2a14" # v0.4.1 KEYWORDS="amd64" fi @@ -43,7 +43,7 @@ src_unpack() { # TODO: Use or adapt coreos-go.eclass so we have half a chance of # cross-compiling builds working src_compile() { - RKT_STAGE1_IMAGE=/usr/share/rkt/stage1.aci ./build || die + RKT_STAGE1_IMAGE=/usr/share/rkt/stage1.aci CGO_ENABLED=0 ./build || die } src_install() {