| 1 |
commit: dc2a8e235dc64cf77dcf63bdbfd4df0b2265c70a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 29 22:33:15 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 29 22:43:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2a8e23 |
| 7 |
|
| 8 |
app-emulation/rkt: new linux headers lkvm fix (bug 635274) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/635274 |
| 11 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 12 |
|
| 13 |
app-emulation/rkt/Manifest | 1 + |
| 14 |
app-emulation/rkt/rkt-1.29.0.ebuild | 3 ++- |
| 15 |
2 files changed, 3 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest |
| 18 |
index 970ac2ca3c7..b8c872f2c18 100644 |
| 19 |
--- a/app-emulation/rkt/Manifest |
| 20 |
+++ b/app-emulation/rkt/Manifest |
| 21 |
@@ -1,4 +1,5 @@ |
| 22 |
DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4 |
| 23 |
+DIST kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch 2168 SHA256 57e69616f1cb390dd2344245408b43f933617c82565da62ab497c4b2458abf6e SHA512 483acd3758cf66587a173da8e24ef127c04955742d292de663226ebd3a1f3ee41b24a966e771f066cd735d0bda77a15d09ca00a27d3de7130456c0eb3cf7cf5e WHIRLPOOL bde6d42e0b942d20d198bad9d5449f8322fbc2dd9da92005404a74718f9ccfb4993bce19c42b4515e2f0fe479e957f14098d76a35b3c1c1ed061ce3a121c7805 |
| 24 |
DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 1243 SHA256 dfb723ef66b9e9d6caf1e99e1e6d590b7c7d81d63dce22047cb735e8bc716629 SHA512 d8e9d6e656b51d8e4b3bf6939e927a4c11874dfb34b4d649adcbcaf44ec1f95af2bf73e138f94c53aa07cbd79db63a6ebf75f96861f8b13743c942523a3ff106 WHIRLPOOL b8ec75158d1e6ea2e53ec93f1c4dacb6783f5880c43d3ee8efe6bf0c2b8e8e0a0692fda5fd61ee9e889f8b383fa42e4b07518b91fddd5a8f5a4316b00925d85d |
| 25 |
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62 |
| 26 |
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5 |
| 27 |
|
| 28 |
diff --git a/app-emulation/rkt/rkt-1.29.0.ebuild b/app-emulation/rkt/rkt-1.29.0.ebuild |
| 29 |
index 2d951cd3460..314f265ac19 100644 |
| 30 |
--- a/app-emulation/rkt/rkt-1.29.0.ebuild |
| 31 |
+++ b/app-emulation/rkt/rkt-1.29.0.ebuild |
| 32 |
@@ -24,6 +24,7 @@ rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE ) |
| 33 |
rkt_stage1_kvm_lkvm? ( |
| 34 |
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz |
| 35 |
https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch |
| 36 |
+ https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch |
| 37 |
${SRC_URI_KVM} |
| 38 |
) |
| 39 |
rkt_stage1_kvm_qemu? ( |
| 40 |
@@ -77,7 +78,7 @@ src_unpack() { |
| 41 |
for x in ${A}; do |
| 42 |
case ${x} in |
| 43 |
*.img|linux-*) continue ;; |
| 44 |
- kvmtool-include-sysmacros-*) #627564 |
| 45 |
+ kvmtool-include-*) #627564 #635274 |
| 46 |
dest=${S}/stage1/usr_from_kvm/lkvm/patches |
| 47 |
mkdir -p "${dest}" || die |
| 48 |
cp "${DISTDIR}/${x}" "${dest}" || die |
Archives