summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2016-09-29 09:17:20 -0700
committerZac Medico <zmedico@gentoo.org>2016-09-29 09:20:28 -0700
commit3f0f1aa36016a95915f7648c46c6b81468bc4f63 (patch)
treeda6479381f425ea31c95732de7d8764d07e0f4eb /app-emulation/rkt
parentdev-libs/liboil: remove old (diff)
downloadgentoo-3f0f1aa36016a95915f7648c46c6b81468bc4f63.tar.gz
gentoo-3f0f1aa36016a95915f7648c46c6b81468bc4f63.tar.bz2
gentoo-3f0f1aa36016a95915f7648c46c6b81468bc4f63.zip
app-emulation/rkt: rename rkt_stage1_kvm to rkt_stage1_kvm_lkvm
Package-Manager: portage-2.3.1
Diffstat (limited to 'app-emulation/rkt')
-rw-r--r--app-emulation/rkt/rkt-1.11.0.ebuild12
-rw-r--r--app-emulation/rkt/rkt-1.12.0.ebuild12
-rw-r--r--app-emulation/rkt/rkt-1.14.0.ebuild12
3 files changed, 18 insertions, 18 deletions
diff --git a/app-emulation/rkt/rkt-1.11.0.ebuild b/app-emulation/rkt/rkt-1.11.0.ebuild
index fbf338cb35c0..9abbe39d0a54 100644
--- a/app-emulation/rkt/rkt-1.11.0.ebuild
+++ b/app-emulation/rkt/rkt-1.11.0.ebuild
@@ -17,7 +17,7 @@ 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? (
+rkt_stage1_kvm_lkvm? (
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}
@@ -29,8 +29,8 @@ 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 )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
DEPEND=">=dev-lang/go-1.5
app-arch/cpio
@@ -117,7 +117,7 @@ src_configure() {
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
+ use rkt_stage1_kvm_lkvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
if use rkt_stage1_src; then
@@ -127,7 +127,7 @@ src_configure() {
)
fi
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@@ -179,7 +179,7 @@ src_install() {
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
+ elif use rkt_stage1_kvm_lkvm; then
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi
diff --git a/app-emulation/rkt/rkt-1.12.0.ebuild b/app-emulation/rkt/rkt-1.12.0.ebuild
index 0c604bbda0eb..77c2caeb6da4 100644
--- a/app-emulation/rkt/rkt-1.12.0.ebuild
+++ b/app-emulation/rkt/rkt-1.12.0.ebuild
@@ -17,7 +17,7 @@ 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? (
+rkt_stage1_kvm_lkvm? (
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}
@@ -29,8 +29,8 @@ 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 )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
DEPEND=">=dev-lang/go-1.5
app-arch/cpio
@@ -124,7 +124,7 @@ src_configure() {
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
+ use rkt_stage1_kvm_lkvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
if use rkt_stage1_src; then
@@ -134,7 +134,7 @@ src_configure() {
)
fi
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@@ -186,7 +186,7 @@ src_install() {
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
+ elif use rkt_stage1_kvm_lkvm; then
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi
diff --git a/app-emulation/rkt/rkt-1.14.0.ebuild b/app-emulation/rkt/rkt-1.14.0.ebuild
index 858c15b0b7e0..4647369ae5d8 100644
--- a/app-emulation/rkt/rkt-1.14.0.ebuild
+++ b/app-emulation/rkt/rkt-1.14.0.ebuild
@@ -17,7 +17,7 @@ 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? (
+rkt_stage1_kvm_lkvm? (
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}
@@ -29,8 +29,8 @@ 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 )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
DEPEND=">=dev-lang/go-1.5
app-arch/cpio
@@ -124,7 +124,7 @@ src_configure() {
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
+ use rkt_stage1_kvm_lkvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
if use rkt_stage1_src; then
@@ -134,7 +134,7 @@ src_configure() {
)
fi
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@@ -186,7 +186,7 @@ src_install() {
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
+ elif use rkt_stage1_kvm_lkvm; then
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi