gentoo resync : 21.10.2017

3 files changed, 30 insertions, 7 deletions

diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 00fdfbb75d31..f073ee69cc14 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,11 +1,14 @@
 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.27.0.tar.gz 3423285 SHA256 213427c551ddc912622e967b30437e13485b88dcf7021c977a3205a1b03801a1 SHA512 8884683ed1bd456542f61f407509db1664589f05732b4c179954781fb847d00d311e973f7646b07eb5685e437793dc4e265686f5bb91b6131dd101466d21ab40 WHIRLPOOL b2fb1715ab1eea03a0c7345c9502f984116fe3ab3f394d9e9ab237dbedc4c902dd7790c99c3dabc80c124c7ebaf76aa21b53e7c42e13be0df53d7fdf4ba308bf
 DIST rkt-1.28.1.tar.gz 3425099 SHA256 2610749f412ca697c57a797c8dd0024c4c215d7dd824599d8ed6f4297abd5e07 SHA512 02d47f4e95e5ff9dc82cd645f1c69bb1fe5ab856c32b3b29bcd74c0e96ae0b5831a610cbde04614d216e4f7387af54f904ebd31ddc3acc1d2cfa0178805fd811 WHIRLPOOL a7e1489b1295795fe3908e51f81be6db3ffd6b0ad17aa4828e7fb07551ea4a6b215fda9f6e4658aa5e7b4e36bcf3472aec8726e2751943c6b0a1aeb910ebe9cf
+DIST rkt-1.29.0.tar.gz 3434520 SHA256 d2d89db86b4b3a586a8288ba7becdb87370d4fbe7e12aa37e9b1e30a9f9c9b20 SHA512 a128abddb29a246b0afea8f7dc81d77aae1e8efaf4dae8fe92aa0f2855c4e4f9dcf7a6f01efa77500ed8a6723db83933c8d1973b284dc62f8e9e0e06b6a20f6d WHIRLPOOL 2fbfc7c7e5e4087d3413d76b8bc0a72b4e34a3ae5c89914c2d4cd1e76128917fd6efb329dca32fc994cb2339369f990e715fd0e66e4d5bdff7196ed98cfe1151
 DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
+DIST rkt-pxe-1478.0.0.img 264382497 SHA256 9897f9e78e207da42a75d03f7ff74c4400dce15843b752adcb3182ebe66c9868 SHA512 5f462b6223a141d72a38857fff26f4f70c0a36f21d1cc69623d946ba42f8b15fa994f222b1934cd16cc5b4e306cf5a8850295492dfb637f2a8fee8b774d7c1e4 WHIRLPOOL 6eed288afed99f26c892af4fdfea23bde5cb617918d34ba7132765bf11bdfc478f364b123d4c505d474740b5381b7f149dba856288ea59dbb5171782975d821b
 DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
-EBUILD rkt-1.27.0.ebuild 7935 SHA256 bb8174b398da396d6e513e1bde5d81ad78bb341ee92c97bdb525d2696383bc59 SHA512 c4004001fa8b3405db814072cd4b684b1d908d30aaf6f27017cec9d1053264ddf7dd658e7fd561a262827b9b6ba45f0e963627e4f05ee24714eb28e825df0372 WHIRLPOOL ff3dc20bda0a665a88ffd6388312b206f9087009455896ca128aab80e917f6525107ac56f73ead1fe30f0837a85b0f7f269b4c340c35d34d83844e1bda84a3a6
-EBUILD rkt-1.28.1.ebuild 7935 SHA256 bb8174b398da396d6e513e1bde5d81ad78bb341ee92c97bdb525d2696383bc59 SHA512 c4004001fa8b3405db814072cd4b684b1d908d30aaf6f27017cec9d1053264ddf7dd658e7fd561a262827b9b6ba45f0e963627e4f05ee24714eb28e825df0372 WHIRLPOOL ff3dc20bda0a665a88ffd6388312b206f9087009455896ca128aab80e917f6525107ac56f73ead1fe30f0837a85b0f7f269b4c340c35d34d83844e1bda84a3a6
+DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176
+EBUILD rkt-1.28.1.ebuild 8434 SHA256 4bccd7953cb8c79bba87aea435670a3938f75e7d337a328456c1ef7b9ea273c5 SHA512 deb1f456e15eca2b466925aadff9209edbc1607cb09c5a29d308f012f9893ab8d3b40eddae12c07355d13ab757d0259d86c3f83988f055ed36a34385b5f7922c WHIRLPOOL eb5f11b4988992771e880d4eef2e48fe76563cee14875ba2f82270d2401543f1c4987aab41cabdfd6b72fc43b1710e9ba9809c52bb079e9caa76b6113510a81e
+EBUILD rkt-1.29.0.ebuild 8434 SHA256 ca68ae315fa04eb8ad71f88d414a9eb05d1d5ee3cbf07f0a9bf68aa391d370df SHA512 42c0df7a9eefbd790005e6767208e54f13dfc2d2e231142de849ec522718d2279f8451c9cf741fda7801f41119c1e7101ecc22bfcda1275090579f29c478cd6b WHIRLPOOL e0476bd1b9e3830928ea43f77e4601caa45eca4a65809a2087772a3a2df8e38ada8c00f0169e9acf68996390deb262e3c232cbed2ef52864ac72f47aedf8fb57
 MISC ChangeLog 7991 SHA256 30a1b4af83fc5287d114ea22878ebda9a1f836154faedc5d98d0ab6b958ea2bc SHA512 c07091f33bbf19dc6c6854af43d8fd1c20a699741781551ccc2e36e6bb23bb4b7ceb689c28d8242a18b8c77a34a1cf986cd664f41b9a2cf2c96783691149cfb6 WHIRLPOOL 77cae18c32825b6fd76ed6c0c19e6f7641e7e6c5789f7e11cfe23c87ab281cfac0fc1a3a265e1e7c83341eaef8bd75b65225ce76f0522b66c9d0ff6cf7ab1c58
 MISC metadata.xml 1468 SHA256 da602dafea8bc6a9f51415e55758c77df8a25affb5b33a0a179076c672c85c89 SHA512 e0548fddd59d422eb04b0b18b98b273d0f3d39465c91539fdfce71583388a6651e878725cf196b0c74efa42b489c44b12e4671e28b3f16d76a16fb8184c3da1a WHIRLPOOL caa1d09b248e7f226bc32aaf21591746e27ef04b2f5c9313cc1e43706fdf2b795abace41ee8584b7ee1e9dd2d7ef9671f87c91915429218bf18234e9dbdbffc4
diff --git a/app-emulation/rkt/rkt-1.28.1.ebuild b/app-emulation/rkt/rkt-1.28.1.ebuild
index c15c8003546e..ea1b51224b7e 100644
--- 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
 }
 
diff --git a/app-emulation/rkt/rkt-1.27.0.ebuild b/app-emulation/rkt/rkt-1.29.0.ebuild
index c15c8003546e..2d951cd34606 100644
--- a/app-emulation/rkt/rkt-1.27.0.ebuild
+++ b/app-emulation/rkt/rkt-1.29.0.ebuild
@@ -7,8 +7,8 @@ inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
 
 KEYWORDS="~amd64"
 
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
+PXE_VERSION="1478.0.0"
+PXE_SYSTEMD_VERSION="v233"
 KVM_LINUX_VERSION="4.9.2"
 KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
 QEMU_VERSION="v2.8.0"
@@ -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
 }