app-emulation/xen: add upstream patches

Bug: https://bugs.gentoo.org/686024
Closes: https://bugs.gentoo.org/685458
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Yixun Lan <dlan@gentoo.org>

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 67789c8e3392fc63438161825fad44f8dd421963..edfa93150e806a0bdcd0e6e1f5363961ce4e5f81 100644 (file)
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,4 +2,5 @@ DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a7816
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
 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-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de

diff --git a/app-emulation/xen/xen-4.12.0.ebuild b/app-emulation/xen/xen-4.12.0-r1.ebuild
similarity index 97%
rename from app-emulation/xen/xen-4.12.0.ebuild
rename to app-emulation/xen/xen-4.12.0-r1.ebuild
index 66e0a466695cff1573b49a1d650c377ea3b76195..ca265f67d88230a0a704acc15a72a4184d2f39fa 100644 (file)
--- a/app-emulation/xen/xen-4.12.0.ebuild
+++ b/app-emulation/xen/xen-4.12.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
        SRC_URI=""
 else
        KEYWORDS="~amd64 ~arm -x86"
-       UPSTREAM_VER=
+       UPSTREAM_VER=0
        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"