Skip to content

Commit

Permalink
app-emulation/rkt: version bump to 1.10.1 (fixes bug 585208)
Browse files Browse the repository at this point in the history 
This includes the patch from rkt/rkt#2868
and --enable-sdjournal=no is passed to econf when USE=systemd is
not enabled.

Package-Manager: portage-2.3.0
  • Loading branch information
@zmedico
zmedico committed Jul 19, 2016
1 parent 89aebe8 commit 7f42a1d
Show file tree
Hide file tree
Showing 2 changed files with 196 additions and 0 deletions.
3 changes: 3 additions & 0 deletions app-emulation/rkt/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
193 changes: 193 additions & 0 deletions app-emulation/rkt/rkt-1.10.1.ebuild
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6

inherit autotools flag-o-matic systemd toolchain-funcs

KEYWORDS="~amd64"

PXE_VERSION="1068.0.0"
PXE_SYSTEMD_VERSION="v229"
KVM_LINUX_VERSION="4.3.1"
KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"

SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/coreos/rkt/commit/64e931a183d12a30e3e25deefbeab0753dca99bf.patch -> rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
rkt_stage1_kvm? (
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
${PXE_URI} -> ${PXE_FILE}
)
rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"

DESCRIPTION="A CLI for running app containers, and an implementation of the App
Container Spec."
HOMEPAGE="https://github.com/coreos/rkt"

LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"

DEPEND=">=dev-lang/go-1.5
app-arch/cpio
app-crypt/trousers
sys-fs/squashfs-tools
dev-perl/Capture-Tiny
rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"

RDEPEND="!app-emulation/rocket
rkt_stage1_host? ( systemd? (
>=sys-apps/systemd-222
app-shells/bash:0
) )"

BUILDDIR="build-${P}"
STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"

src_unpack() {
local x
for x in ${A}; do
case ${x} in
*.img|linux-*) continue ;;
kvmtool-*)
mkdir kvmtool || die
pushd kvmtool >/dev/null || die
unpack ${x}
popd >/dev/null || die
;;
*)
unpack ${x}
esac
done
}

src_prepare() {
eapply "${DISTDIR}/rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch"
eapply_user

# disable git fetch of systemd
sed -e 's~^include makelib/git.mk$~'\
'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
'else\n'\
'\t\0\n'\
'endif~' -i stage1/usr_from_src/usr_from_src.mk || die

# disable git fetch of kvmtool
sed -e 's~^include makelib/git.mk$~'\
'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
'else\n'\
'\t\0\n'\
'endif~' -i stage1/usr_from_kvm/lkvm.mk || die

# disable fetch of kernel sources
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
-i stage1/usr_from_kvm/kernel.mk || die

if use rkt_stage1_host; then
# Make systemdUnitsPath consistent with host
sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
-i stage1/init/init.go || die
fi

eautoreconf
}

src_configure() {
local flavors myeconfargs=(
--with-stage1-default-images-directory="/usr/share/rkt"
--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
)

use systemd || myeconfargs+=( --enable-sdjournal=no )

# enable flavors (first is default)
use rkt_stage1_host && flavors+=",host"
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
use rkt_stage1_kvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )

if use rkt_stage1_src; then
myeconfargs+=(
--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
)
fi

if use rkt_stage1_coreos || use rkt_stage1_kvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
)
fi

# Go's 6l linker does not support PIE, disable so cgo binaries
# which use 6l+gcc for linking can be built correctly.
if gcc-specs-pie; then
append-ldflags -nopie
fi

export CC=$(tc-getCC)
export CGO_ENABLED=1
export CGO_CFLAGS="${CFLAGS}"
export CGO_CPPFLAGS="${CPPFLAGS}"
export CGO_CXXFLAGS="${CXXFLAGS}"
export CGO_LDFLAGS="${LDFLAGS}"
export BUILDDIR

econf "${myeconfargs[@]}"
}

src_compile() {
local arch=${ARCH}
case ${arch} in
amd64) arch=x86_64;;
esac
ARCH=${arch} emake
}

src_install() {
dodoc README.md
use doc && dodoc -r Documentation
use examples && dodoc -r examples
use actool && dobin "${S}/${BUILDDIR}/tools/actool"

dobin "${S}/${BUILDDIR}/target/bin/rkt"

insinto /usr/share/rkt
doins "${S}/${BUILDDIR}/target/bin/"*.aci

# create symlink for default stage1 image path
if use rkt_stage1_host; then
dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_src; then
dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_coreos; then
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_fly; then
dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_kvm; then
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi

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}-metadata.service
systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
}

0 comments on commit 7f42a1d

Please sign in to comment.