commit:     ecd73933c05e65dafa92ff00856e206a1edb57b8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 08:52:59 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 08:53:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecd73933

app-emulation/rkt: version bump to 1.12.0

Package-Manager: portage-2.3.0

 app-emulation/rkt/Manifest          |   1 +
 app-emulation/rkt/rkt-1.12.0.ebuild | 199 ++++++++++++++++++++++++++++++++++++
 2 files changed, 200 insertions(+)

diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index f7d88e9..53fb743 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,6 +2,7 @@ DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 
243930 SHA256 89f4c
 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.11.0.tar.gz 2767797 SHA256 
cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 
dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0
 WHIRLPOOL 
4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
+DIST rkt-1.12.0.tar.gz 920 SHA256 
1af13e1465e6c5beae615d6524813f74c043cc70e110705a8830445695b62b1a SHA512 
ee69079dced376673350dc20a99b75960cc56cee840e4ab119c2c4ef6685db46a4e1e6ebef2949fa32a91aa8da7719a86834b71880a9d2b246ef3048445ac626
 WHIRLPOOL 
0265fe0601d648c3800b96830e94fb65f25571e584e5d97d44c2432d55cf81c98f0efb85628dc345c302401e0a1bcc958cada56452a1bd905792db7806efbed7
 DIST rkt-pxe-1068.0.0.img 261402717 SHA256 
f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 
7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a
 WHIRLPOOL 
1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
 DIST rkt-pxe-1097.0.0.img 240454650 SHA256 
aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 
7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7
 WHIRLPOOL 
067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
 DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 
789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 
2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3
 WHIRLPOOL 
dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de

diff --git a/app-emulation/rkt/rkt-1.12.0.ebuild 
b/app-emulation/rkt/rkt-1.12.0.ebuild
new file mode 100644
index 0000000..103e5c4
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.12.0.ebuild
@@ -0,0 +1,199 @@
+# 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 user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1097.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
+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="rkt is an App Container runtime for Linux"
+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"
+
+pkg_setup() {
+       enewgroup rkt-admin
+       enewgroup rkt
+}
+
+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_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
+
+       keepdir /etc/${PN}
+       fowners :rkt-admin /etc/${PN}
+       fperms 2775 /etc/${PN}
+}

Reply via email to