commit: f3293308e21a0894ccdf8ef84f019cdd28e029b9 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Wed Apr 3 04:02:58 2019 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Wed Apr 3 07:07:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3293308
app-emulation/xen-tools: update edk2/seabios Bug: https://bugs.gentoo.org/680284 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-emulation/xen-tools/Manifest | 2 ++ ...ls-4.11.1-r2.ebuild => xen-tools-4.11.1-r3.ebuild} | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 7c6b2177429..e92f3a49114 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,6 +1,8 @@ +DIST edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz 38714813 BLAKE2B 1c0670c6447aa7d2610e59481324eafe3dbf54cc0480c855380372cf5b95469de4182b569d1c4429df71ceb9be014cb414e070a808609d185b488519955b8677 SHA512 8eb88006500d9d6982e5565bdb71bf47dfe2b9669e107f48b6b237d7efbbfb54b9fd81841421c347e5c0ca45ef9c08f0b95983c8b922c2e1072b0e42b8ede92c DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d08067d3fd639c83f2a379670779ecc60c74c2671ea4eb4a6659fe08ac2d7d4ff337b010b42a908a50829a2d18eeb SHA512 f65dabde3df967224e2072817211786ee4fc3994ee31f8f9d6f67fd74e3479e1da459c720169dd81020cdc1777e4600e531bb124b4625c2ded42c6005bdc802a DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27 +DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412 DIST xen-4.11.1-upstream-patches-0.tar.xz 45416 BLAKE2B 3990dbf338c2aebe1cd601d7caccc6919352cc1f937677d447c3d2626143710bdfda7f1977e2ad7112abff9cad6bb660bc1b0993ca74b2eff51da6d4f4365813 SHA512 ecbc13e607581a6f9b4e318145afaa92ce641bda6fb12585408f61bcf24fa9b245004ad22150e109db5d38fcea38e6bdaf6bb2d6eaaf8e5d5fa8816b5a19e456 diff --git a/app-emulation/xen-tools/xen-tools-4.11.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild similarity index 96% rename from app-emulation/xen-tools/xen-tools-4.11.1-r2.ebuild rename to app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild index bfa221f47fb..04a72b80ad3 100644 --- a/app-emulation/xen-tools/xen-tools-4.11.1-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild @@ -24,11 +24,10 @@ else # xen-tools's gentoo patches version which apply to this specific ebuild GENTOO_GPV=0 # xen-tools ovmf's patches - OVMF_VER=3 + OVMF_VER= - SEABIOS_VER=1.10.0 - # OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05 - OVMF_PV=20170321 + SEABIOS_VER=1.11.1 + EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56 [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz @@ -42,9 +41,8 @@ else OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"; SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz + https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-${SEABIOS_VER}.tar.gz + ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz ${OVMF_PATCHSET_URI} ) ${UPSTREAM_PATCHSET_URI} ${SECURITY_PATCHSET_URI} @@ -216,7 +214,7 @@ src_prepare() { fi # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die popd > /dev/null @@ -235,11 +233,12 @@ src_prepare() { if use ovmf; then if [[ -n ${OVMF_VER} ]];then einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/ovmf-*/ > /dev/null + pushd "${WORKDIR}"/edk2-*/ > /dev/null eapply "${WORKDIR}"/patches-ovmf popd > /dev/null fi - mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die + mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die + cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die fi mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
