From 09cc32c73ff8a9517164d329317e831965b35faa Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 9 Feb 2016 11:42:46 -0800 Subject: [PATCH 1/4] app-emulation/rkt: fix STAGE1INSTALLDIR --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 35ae75113c..8e657e5381 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -7,7 +7,7 @@ EAPI=5 AUTOTOOLS_AUTORECONF=yes AUTOTOOLS_IN_SOURCE_BUILD=yes -inherit autotools-utils flag-o-matic systemd toolchain-funcs +inherit autotools-utils flag-o-matic systemd toolchain-funcs multilib inherit cros-workon CROS_WORKON_PROJECT="coreos/rkt" @@ -58,7 +58,7 @@ RDEPEND="!app-emulation/rocket BUILDDIR="build-${P}" -STAGE1INSTALLDIR="/usr/share/rkt/" +STAGE1INSTALLDIR="/usr/$(get_libdir)/rkt/stage1-images" STAGE1FIRST="" STAGE1FLAVORS="" From 27bc572d45464a0e6d9f1a880c16dfd93e3fa824 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 9 Feb 2016 11:42:18 -0800 Subject: [PATCH 2/4] app-emulation/rkt: fix up stage1-default-location --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 8e657e5381..71eb366f80 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -92,7 +92,7 @@ src_configure() { myeconfargs+=( $(use_enable tpm) ) myeconfargs+=( --with-stage1-flavors="${STAGE1FLAVORS}" ) - myeconfargs+=( --with-stage1-default-location="/usr/share/rkt/stage1-${STAGE1FIRST}.aci" ) + myeconfargs+=( --with-stage1-default-location="${STAGE1INSTALLDIR}/stage1-${STAGE1FIRST}.aci" ) # Go's 6l linker does not support PIE, disable so cgo binaries # which use 6l+gcc for linking can be built correctly. From cbc7edaa50236036f1ad125d261a86615b1ee5f8 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 9 Feb 2016 12:51:29 -0800 Subject: [PATCH 3/4] app-emulation/rkt: symlink old stage1 aci location to new one --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 71eb366f80..37ca82573e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -126,6 +126,9 @@ src_install() { einfo $(basename "${stage1aci}") done + # symlink old stage1 aci directory to the new install location + dosym ../$(get_libdir)/rkt/stage1-images /usr/share/rkt + systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer systemd_enable_service multi-user.target ${PN}-gc.timer From c2c57e995cf1fb576cbedb6d973a47bb6f68043d Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 9 Feb 2016 11:43:15 -0800 Subject: [PATCH 4/4] app-emulation/rkt: bump rev --- .../app-emulation/rkt/{rkt-1.0.0.ebuild => rkt-1.0.0-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/{rkt-1.0.0.ebuild => rkt-1.0.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0-r1.ebuild