app-emulation/rkt: fix to compile with glibc-2.25 (bug 580330)

Thanks to Dennis Schridde <devurandom@gmx.net> for the
lkvm patch instructions.

Bug: https://bugs.gentoo.org/580330
Bug: https://bugs.gentoo.org/627564
Package-Manager: Portage-2.3.12, Repoman-2.3.3

diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index e6aeda4effa9fdac47382113a0d3210cd40a029f..d31af73e4e22de327aa7e5a357b3dcfbe9e2047f 100644 (file)
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,4 +1,5 @@
 DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
+DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 1243 SHA256 dfb723ef66b9e9d6caf1e99e1e6d590b7c7d81d63dce22047cb735e8bc716629 SHA512 d8e9d6e656b51d8e4b3bf6939e927a4c11874dfb34b4d649adcbcaf44ec1f95af2bf73e138f94c53aa07cbd79db63a6ebf75f96861f8b13743c942523a3ff106 WHIRLPOOL b8ec75158d1e6ea2e53ec93f1c4dacb6783f5880c43d3ee8efe6bf0c2b8e8e0a0692fda5fd61ee9e889f8b383fa42e4b07518b91fddd5a8f5a4316b00925d85d
 DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
 DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
 DIST rkt-1.28.1.tar.gz 3425099 SHA256 2610749f412ca697c57a797c8dd0024c4c215d7dd824599d8ed6f4297abd5e07 SHA512 02d47f4e95e5ff9dc82cd645f1c69bb1fe5ab856c32b3b29bcd74c0e96ae0b5831a610cbde04614d216e4f7387af54f904ebd31ddc3acc1d2cfa0178805fd811 WHIRLPOOL a7e1489b1295795fe3908e51f81be6db3ffd6b0ad17aa4828e7fb07551ea4a6b215fda9f6e4658aa5e7b4e36bcf3472aec8726e2751943c6b0a1aeb910ebe9cf

diff --git a/app-emulation/rkt/rkt-1.28.1.ebuild b/app-emulation/rkt/rkt-1.28.1.ebuild
index c15c8003546efd3afc689827867e2d7d4d57414c..ea1b51224b7e63947a0d9b8d08646951761bdbac 100644 (file)
--- a/app-emulation/rkt/rkt-1.28.1.ebuild
+++ b/app-emulation/rkt/rkt-1.28.1.ebuild
@@ -23,6 +23,7 @@ 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_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
        ${SRC_URI_KVM}
 )
 rkt_stage1_kvm_qemu? (
@@ -72,10 +73,15 @@ pkg_setup() {
 }
 
 src_unpack() {
-       local x
+       local dest x
        for x in ${A}; do
                case ${x} in
                        *.img|linux-*) continue ;;
+                       kvmtool-include-sysmacros-*) #627564
+                               dest=${S}/stage1/usr_from_kvm/lkvm/patches
+                               mkdir -p "${dest}" || die
+                               cp "${DISTDIR}/${x}" "${dest}" || die
+                               ;;
                        kvmtool-*)
                                mkdir kvmtool || die
                                pushd kvmtool >/dev/null || die
@@ -150,6 +156,10 @@ src_prepare() {
                        -i stage1/init/init.go || die
        fi
 
+       if use rkt_stage1_kvm_qemu; then
+               sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die
+       fi
+
        eautoreconf
 }