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

Merge pull request #1580 from steveeJ/rkt-0.9

Browse Source 
app-emulation/rkt: version bump to 0.9
This commit is contained in:
Michael Marineau 2015-10-12 12:22:09 -07:00
commit 7d62afd9f6
2 changed files with 8 additions and 8 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-0.8.1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.9.0.ebuild vendored
View File

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

@ -19,7 +19,7 @@ if [[ "${PV}" == "9999" ]]; then
KEYWORDS="~amd64" KEYWORDS="~amd64"
else else
KEYWORDS="amd64" KEYWORDS="amd64"
CROS_WORKON_COMMIT="a4b17f07700afd4e24be0153ca4fc73c35e14c31" # v0.8.1 CROS_WORKON_COMMIT="000c9b7614d98007fde675b56bb426bf7e4fbcbd" # v0.9.0
fi fi
PXE_VERSION="794.1.0" PXE_VERSION="794.1.0"
@ -56,19 +56,19 @@ RDEPEND="!app-emulation/rocket
BUILDDIR="build-${P}" BUILDDIR="build-${P}"
src_configure() { src_configure() {
local myeconfargs=( local myeconfargs=()
--with-stage1-image-path="/usr/share/rkt/stage1.aci"
)
if use rkt_stage1_host; then if use rkt_stage1_host; then
myeconfargs+=( --with-stage1="host" ) STAGE1FLAVOR="host"
elif use rkt_stage1_src; then elif use rkt_stage1_src; then
myeconfargs+=( --with-stage1="src" ) STAGE1FLAVOR="src"
elif use rkt_stage1_coreos; then elif use rkt_stage1_coreos; then
myeconfargs+=( --with-stage1="coreos" ) STAGE1FLAVOR="coreos"
myeconfargs+=( --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" ) myeconfargs+=( --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" )
myeconfargs+=( --with-coreos-local-pxe-image-systemd-version=v"${PXE_SYSTEMD_VERSION}" ) myeconfargs+=( --with-coreos-local-pxe-image-systemd-version=v"${PXE_SYSTEMD_VERSION}" )
fi fi
myeconfargs+=( --with-stage1="${STAGE1FLAVOR}" )
myeconfargs+=( --with-stage1-image-path="/usr/share/rkt/stage1-${STAGE1FLAVOR}.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.
@ -96,7 +96,7 @@ src_install() {
dobin "${S}/${BUILDDIR}/bin/rkt" dobin "${S}/${BUILDDIR}/bin/rkt"
insinto /usr/share/rkt/ insinto /usr/share/rkt/
doins "${S}/${BUILDDIR}/bin/stage1.aci" doins "${S}/${BUILDDIR}/bin/stage1-${STAGE1FLAVOR}.aci"
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