summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2017-10-29 15:33:15 -0700
committerZac Medico <zmedico@gentoo.org>2017-10-29 15:43:23 -0700
commitdc2a8e235dc64cf77dcf63bdbfd4df0b2265c70a (patch)
tree464c92ab6f55bcd76b4e41972e3f1e081b27cbbb /app-emulation/rkt/rkt-1.29.0.ebuild
parentnet-misc/youtube-dl: Old. (diff)
downloadgentoo-dc2a8e235dc64cf77dcf63bdbfd4df0b2265c70a.tar.gz
gentoo-dc2a8e235dc64cf77dcf63bdbfd4df0b2265c70a.tar.bz2
gentoo-dc2a8e235dc64cf77dcf63bdbfd4df0b2265c70a.zip
app-emulation/rkt: new linux headers lkvm fix (bug 635274)
Closes: https://bugs.gentoo.org/635274 Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'app-emulation/rkt/rkt-1.29.0.ebuild')
-rw-r--r--app-emulation/rkt/rkt-1.29.0.ebuild3
1 files changed, 2 insertions, 1 deletions
diff --git a/app-emulation/rkt/rkt-1.29.0.ebuild b/app-emulation/rkt/rkt-1.29.0.ebuild
index 2d951cd34606..314f265ac191 100644
--- a/app-emulation/rkt/rkt-1.29.0.ebuild
+++ b/app-emulation/rkt/rkt-1.29.0.ebuild
@@ -24,6 +24,7 @@ rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
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
https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
+ https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch
${SRC_URI_KVM}
)
rkt_stage1_kvm_qemu? (
@@ -77,7 +78,7 @@ src_unpack() {
for x in ${A}; do
case ${x} in
*.img|linux-*) continue ;;
- kvmtool-include-sysmacros-*) #627564
+ kvmtool-include-*) #627564 #635274
dest=${S}/stage1/usr_from_kvm/lkvm/patches
mkdir -p "${dest}" || die
cp "${DISTDIR}/${x}" "${dest}" || die