commit: 50508c2fed59ef3bf0301387276146f936197ca3 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Sat May 18 20:14:12 2019 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Wed May 22 02:14:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50508c2f
app-emulation/xen-tools: fix ipxe building with gcc9 Closes: https://bugs.gentoo.org/685694 Closes: https://github.com/gentoo/gentoo/pull/12045 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-emulation/xen-tools/Manifest | 1 + .../{xen-tools-4.12.0-r2.ebuild => xen-tools-4.12.0-r3.ebuild} | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 773a5c59100..7835f463009 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -12,4 +12,5 @@ DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e2253488 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56 DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b +DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b diff --git a/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild similarity index 98% rename from app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild rename to app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild index ea900713a63..ccd98499ae3 100644 --- a/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild @@ -20,7 +20,7 @@ else UPSTREAM_VER=0 SECURITY_VER= # xen-tools's gentoo patches tarball - GENTOO_VER=17 + GENTOO_VER=18 # xen-tools's gentoo patches version which apply to this specific ebuild GENTOO_GPV=0 # xen-tools ovmf's patches @@ -250,6 +250,9 @@ src_prepare() { # ipxe if use ipxe; then cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die + cp "${WORKDIR}/patches-gentoo/${PN}-4.12.0-ipxe-gcc9.patch" \ + tools/firmware/etherboot/patches/ipxe-gcc9.patch || die + echo "ipxe-gcc9.patch" >> tools/firmware/etherboot/patches/series || die fi mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
