commit: 670b6ca726c1175478eb9c40160eac1e65096316 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Wed May 15 20:05:15 2019 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Fri May 17 08:48:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670b6ca7
app-emulation/xen: add upstream patches Bug: https://bugs.gentoo.org/683694 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-emulation/xen/Manifest | 2 +- app-emulation/xen/files/xen.gcc9.fixes.patch | 34 ++++++++++++++++++++++ .../{xen-4.11.1-r2.ebuild => xen-4.11.1-r3.ebuild} | 5 +++- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 267dd54ebce..67789c8e339 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,5 +1,5 @@ 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-1.tar.xz 60048 BLAKE2B 60d5960183433776c881696e9b50f800c2724c9815b3ebb6eb994d108ab4b3de92cf8d7ec79c86958e8811b19550f802c26326351d49f35391cfeb3e6a1d5e76 SHA512 788245219ed374b80423f01754abae457b36de098a0d568828af02142b55692e2df78eceb8cb2a11fc20e9ee59c2cebfea8ec1de0a9d6dc64f327a88cf6bf918 +DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de diff --git a/app-emulation/xen/files/xen.gcc9.fixes.patch b/app-emulation/xen/files/xen.gcc9.fixes.patch new file mode 100644 index 00000000000..111b063f9c1 --- /dev/null +++ b/app-emulation/xen/files/xen.gcc9.fixes.patch @@ -0,0 +1,34 @@ +--- xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h.orig 2018-11-29 14:04:11.000000000 +0000 ++++ xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h 2019-02-05 21:32:50.056774501 +0000 +@@ -28,7 +28,7 @@ + /* Allow for both IOAPIC and IOSAPIC. */ + #define IO_xAPIC_route_entry IO_APIC_route_entry + +-struct IO_APIC_route_remap_entry { ++struct __packed IO_APIC_route_remap_entry { + union { + u64 val; + struct { +--- xen-4.11.1/xen/common/trace.c.orig 2018-11-29 14:04:11.000000000 +0000 ++++ xen-4.11.1/xen/common/trace.c 2019-02-06 20:31:27.370256971 +0000 +@@ -819,7 +819,7 @@ + void __trace_hypercall(uint32_t event, unsigned long op, + const xen_ulong_t *args) + { +- struct __packed { ++ struct { + uint32_t op; + uint32_t args[6]; + } d; +--- xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c.orig 2018-11-29 14:04:11.000000000 +0000 ++++ xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c 2019-02-10 19:24:09.378805103 +0000 +@@ -171,6 +171,9 @@ + printk("%sMTRR variable ranges %sabled:\n", level, + mtrr_state.enabled ? "en" : "dis"); + width = (paddr_bits - PAGE_SHIFT + 3) / 4; ++ if ( width > 64 ) { ++ width=64; ++ } + + for (i = 0; i < num_var_ranges; ++i) { + if (mtrr_state.var_ranges[i].mask & MTRR_PHYSMASK_VALID) diff --git a/app-emulation/xen/xen-4.11.1-r2.ebuild b/app-emulation/xen/xen-4.11.1-r3.ebuild similarity index 97% rename from app-emulation/xen/xen-4.11.1-r2.ebuild rename to app-emulation/xen/xen-4.11.1-r3.ebuild index ad9b169a8a5..8eef8eb0de4 100644 --- a/app-emulation/xen/xen-4.11.1-r2.ebuild +++ b/app-emulation/xen/xen-4.11.1-r3.ebuild @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then SRC_URI="" else KEYWORDS="~amd64 ~arm -x86" - UPSTREAM_VER=1 + UPSTREAM_VER=2 SECURITY_VER= GENTOO_VER= @@ -100,6 +100,9 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-4.6-efi.patch + # https://src.fedoraproject.org/rpms/xen/blob/master/f/xen.gcc9.fixes.patch + eapply "${FILESDIR}"/${PN}.gcc9.fixes.patch + # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
