mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 15:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1764 from mischief/rkt-libdir

Browse Source 
fix up rkt libdir for stage1's
This commit is contained in:
Nick Owens 2016-02-10 13:55:22 -08:00
commit 004294973f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0-r1.ebuild vendored
View File

9
sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild vendored
View File

@ -7,7 +7,7 @@ EAPI=5
AUTOTOOLS_AUTORECONF=yes AUTOTOOLS_AUTORECONF=yes
AUTOTOOLS_IN_SOURCE_BUILD=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 inherit cros-workon
CROS_WORKON_PROJECT="coreos/rkt" CROS_WORKON_PROJECT="coreos/rkt"
@ -58,7 +58,7 @@ RDEPEND="!app-emulation/rocket
BUILDDIR="build-${P}" BUILDDIR="build-${P}"
STAGE1INSTALLDIR="/usr/share/rkt/" STAGE1INSTALLDIR="/usr/$(get_libdir)/rkt/stage1-images"
STAGE1FIRST="" STAGE1FIRST=""
STAGE1FLAVORS="" STAGE1FLAVORS=""
@ -92,7 +92,7 @@ src_configure() {
myeconfargs+=( $(use_enable tpm) ) myeconfargs+=( $(use_enable tpm) )
myeconfargs+=( --with-stage1-flavors="${STAGE1FLAVORS}" ) 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 # Go's 6l linker does not support PIE, disable so cgo binaries
# which use 6l+gcc for linking can be built correctly. # which use 6l+gcc for linking can be built correctly.
@ -126,6 +126,9 @@ src_install() {
einfo $(basename "${stage1aci}") einfo $(basename "${stage1aci}")
done 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.service
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
systemd_enable_service multi-user.target ${PN}-gc.timer systemd_enable_service multi-user.target ${PN}-gc.timer