diff options
Diffstat (limited to 'app-emulation/xen')
| -rw-r--r-- | app-emulation/xen/Manifest | 8 | ||||
| -rw-r--r-- | app-emulation/xen/files/xen.gcc9.fixes.patch | 34 | ||||
| -rw-r--r-- | app-emulation/xen/xen-4.11.1-r3.ebuild (renamed from app-emulation/xen/xen-4.11.1-r2.ebuild) | 5 | ||||
| -rw-r--r-- | app-emulation/xen/xen-4.12.0-r1.ebuild (renamed from app-emulation/xen/xen-4.12.0.ebuild) | 5 |
4 files changed, 47 insertions, 5 deletions
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 374f4a5da9c5..ac4fce169edd 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,10 +1,12 @@ AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689 +AUX xen.gcc9.fixes.patch 1265 BLAKE2B 0ebf81cd2f43a0da99b4580b0bb9ac09128f26674a173bc74c2dbdb1f668148230d09b6b90a29f2aeca54a6e6107b9001069765281cfe628640e348e2961cf7b SHA512 c305c526732e479e95684f74ef3f90501ff33e7da38e38c5ea373f3db28d40e6fcd7768c4420d43268fb71fcdbd1e41b217d0a317ad74a8c073a2af12588a832 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-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de EBUILD xen-4.10.3-r1.ebuild 4795 BLAKE2B f1b5a6416aa0157162eda97a4d889f46325b51144d9aba769832ec7f503d7ee4cd74c580fdb6b61c51894abb9fb2761eef80183c6c4666fb65e1295aaf08c510 SHA512 6d82456c23ea10b238edb48920d5bc00ac262b2593415dd6f1528336487c036b100c0f8fe00afc109dd9dbdeede9909d1c7d8f2e0423e586f5746af280b8fc6c -EBUILD xen-4.11.1-r2.ebuild 4796 BLAKE2B f556a3cb83ea8dd6d59217dba949f31df8331ff0eed1a47548a15f3c7eca685a826e6005cc804a91c1327d54cedbcd4f719ce04c56df44d74e6e6b00bd2915e5 SHA512 af81b70e0984125de5ef57087dd5ed799ad968fa25c2b6fb18984bdcb2e30aa812b46602866fc0e57716813370ac9d837816b39ccf0ad743ffdb58502d5f4b41 -EBUILD xen-4.12.0.ebuild 4795 BLAKE2B cbefe3730fbe04f78f923d091112033974fa1286f08e8170b53e3c9bc4f93f16ac6b3183380a1ee0eea9872418ddf63b7efd72a6ec500ab9203e6dbd2ffa4de8 SHA512 d348049aae53c426a45da0371472ad09d578706b7cd772444f0fd0394eecc8d5cbb6ee5d6cdc1a854119791af908ae416b4e615598103e3b900b8740514148d5 +EBUILD xen-4.11.1-r3.ebuild 4919 BLAKE2B 71325d57eebd04bf8329f02c67317c2943af99a69b7edd410351bc4af916014e06327119ee696d4a61ae9b24f76c11ecbbeec33b570393b3d485528382a60bdd SHA512 6525b31f58a9487c8d5287aff58c11cbb9d5fd1e084e72785f2c9c84a539eab3eaee704ecbcde49fa17ae20384b0a701e19183d0145496fa28eb62045f111d90 +EBUILD xen-4.12.0-r1.ebuild 4919 BLAKE2B 2c1bbe11f0342fef28e7315dd8a0635cae7c40508f8ac9e177be1051bb3b3618835b37e155f8734996aea4b9a65e5d8fa6102f579a4ef2ed8adb3234aed20d9b SHA512 baf9d3881cd2ad8810dc9960aa4b27798aabec125b65d62c1824089eb2b91a140cd1821693fca0ad7b5739f1d5b8c83633764745a4c73fd542c62dc4b784c7db MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946 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 000000000000..111b063f9c1d --- /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 index ad9b169a8a53..8eef8eb0de46 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" diff --git a/app-emulation/xen/xen-4.12.0.ebuild b/app-emulation/xen/xen-4.12.0-r1.ebuild index 66e0a466695c..ca265f67d882 100644 --- 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" |