[patch] app-emulation/rkt-1.0.0.diff

rkt-1.0.0.diff (text/plain), 2.68 KB, created by Kristian on 2016-02-19 17:16:28 UTC

--- /usr/portage/app-emulation/rkt/rkt-9999.ebuild	2015-10-05 19:09:09.000000000 +0200
+++ rkt-1.0.0.ebuild	2016-02-19 17:54:19.647853003 +0100
@@ -8,18 +8,15 @@
 AUTOTOOLS_IN_SOURCE_BUILD=yes
 
 inherit autotools-utils flag-o-matic systemd toolchain-funcs
-inherit git-r3
 
-EGIT_REPO_URI="https://github.com/coreos/rkt.git"
-
-KEYWORDS=""
-PXE_VERSION="738.1.0"
-EGIT_BRANCH="master"
+KEYWORDS="~amd64"
 
+PXE_VERSION="962.0.0"
 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="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
 
 DESCRIPTION="A CLI for running app containers, and an implementation of the App
 Container Spec."
@@ -27,8 +24,8 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
-REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_kvm rkt_stage1_host rkt_stage1_src rkt_stage1_fly +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_kvm rkt_stage1_host rkt_stage1_src rkt_stage1_fly )"
 
 DEPEND=">=dev-lang/go-1.4.1
 	app-arch/cpio
@@ -39,24 +36,28 @@
 		app-shells/bash:0
 	)"
 RDEPEND="!app-emulation/rocket
-	rkt_stage1_host? (
-		>=sys-apps/systemd-222
-		app-shells/bash:0
-	)"
+    rkt_stage1_host? (
+        >=sys-apps/systemd-222
+        app-shells/bash:0
+    )"
 
 BUILDDIR="build-${P}"
 
 src_configure() {
 	local myeconfargs=(
-		--with-stage1-image-path="/usr/share/rkt/stage1.aci"
+		--with-stage1-default-location="/usr/share/rkt/stage1-coreos.aci"
 	)
 
 	if use rkt_stage1_host; then
-		myeconfargs+=( --with-stage1="host" )
+        myeconfargs+=( --with-stage1-flavors="host" )
 	elif use rkt_stage1_src; then
-		myeconfargs+=( --with-stage1="src" )
+		myeconfargs+=( --with-stage1-flavors="src" )
+	elif use rkt_stage1_kvm; then
+		myeconfargs+=( --with-stage1-flavors="kvm" )
+	elif use rkt_stage1_fly; then
+		myeconfargs+=( --with-stage1-flavors="fly" )
 	elif use rkt_stage1_coreos; then
-		myeconfargs+=( --with-stage1="coreos" )
+		myeconfargs+=( --with-stage1-flavors="coreos" )
 		mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
 		cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
 	fi
@@ -87,7 +88,7 @@
 	dobin "${S}/${BUILDDIR}/bin/rkt"
 
 	insinto /usr/share/rkt/
-	doins "${S}/${BUILDDIR}/bin/stage1.aci"
+	doins "${S}/${BUILDDIR}/bin/stage1-coreos.aci"
 
 	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
 	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer