| 1 |
commit: 624e7297911faa220e0657b95d92afa07e471d6b |
| 2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Sep 22 20:02:30 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 29 20:01:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624e7297 |
| 7 |
|
| 8 |
app-emulation/xen-tools: add upstream and security patches, drop old |
| 9 |
|
| 10 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/xen-tools/Manifest | 3 ++- |
| 14 |
...en-tools-4.14.0-r1.ebuild => xen-tools-4.13.1-r4.ebuild} | 13 ++++--------- |
| 15 |
...en-tools-4.14.0-r1.ebuild => xen-tools-4.14.0-r2.ebuild} | 2 +- |
| 16 |
3 files changed, 7 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest |
| 19 |
index d92f49c9655..d697a2518d4 100644 |
| 20 |
--- a/app-emulation/xen-tools/Manifest |
| 21 |
+++ b/app-emulation/xen-tools/Manifest |
| 22 |
@@ -5,8 +5,9 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9 |
| 23 |
DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0 |
| 24 |
DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393 |
| 25 |
DIST xen-4.13.1-upstream-patches-2.tar.xz 53744 BLAKE2B 769b5b8022f7db66f677d8107c6473606376718bffeac7eba09c4270f4005811f472fb9ed2a2804260e0486228edbadfcf8f81bf1dae6d68df37da213d281390 SHA512 b07c865b96c6f48b9d0b4e4c2f3ec19f4dc44884f4024e440a3e537f594f9f5edd6edf805bdefc82e5f1f2520f35f940b64c158972cbf5bfdc8fb2ca7a1b0ac1 |
| 26 |
+DIST xen-4.13.1-upstream-patches-3.tar.xz 87056 BLAKE2B 01d7133b8f7e3c9a42b9771dcb7739777f79f229941114cce70ba2897dd52bf53f08de35602a0b40a120fc155c274dbf91e107856f4afdae2c4f7b4bc0a67cdd SHA512 d67e9ddfbf27dc5a23a77679b1b2524a49c2aec3ff9eb3472f9e075893d87401f8e99707b0652744eb4af7a3ed9a815c3925de49995bcd7c82d97c13a69b5309 |
| 27 |
DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90 |
| 28 |
-DIST xen-4.14.0-upstream-patches-0.tar.xz 6872 BLAKE2B 958ad668362c9c02af39f2a02cde2baa9b9fc8853116c390f43a77bb17c649bfc6a4b51db5cbe564a8c3c440ce736603e44b97f45c50a7836c9a43bfb0d2255a SHA512 a30d9708e64e1405f837b14c1e5a0e28fcb9e7a177c822570e25d0ed118a9c58c380f4ed64a40bf970a9389baf9848e52f7d161efe922b883ee990c8029e7e1f |
| 29 |
+DIST xen-4.14.0-upstream-patches-1.tar.xz 45360 BLAKE2B 0f72a2cc3d18557b86a2a83f97e4141be46a20e3ba59ccc881a34a4408988eba9827e3b927bc07aba9678123d783303e7d47d789e57323a7f6691d718c019dc8 SHA512 3d5093e4367d27e7f6e8d4cc31841a5c80cc3fb870d6cb32131d064e16cbb559e9a783c70eec1ce13c960b3e2a8d5e23e18d26b936bc418b434df3bb801d3e4f |
| 30 |
DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0 |
| 31 |
DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d |
| 32 |
DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1 |
| 33 |
|
| 34 |
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild |
| 35 |
similarity index 98% |
| 36 |
copy from app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild |
| 37 |
copy to app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild |
| 38 |
index 7cf7cb407e7..75da75730f9 100644 |
| 39 |
--- a/app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild |
| 40 |
+++ b/app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild |
| 41 |
@@ -3,7 +3,7 @@ |
| 42 |
|
| 43 |
EAPI=7 |
| 44 |
|
| 45 |
-PYTHON_COMPAT=( python3_{6..9} ) |
| 46 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 47 |
PYTHON_REQ_USE='ncurses,xml,threads(+)' |
| 48 |
|
| 49 |
inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs |
| 50 |
@@ -17,16 +17,16 @@ if [[ $PV == *9999 ]]; then |
| 51 |
S="${WORKDIR}/${REPO}" |
| 52 |
else |
| 53 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 54 |
- UPSTREAM_VER=0 |
| 55 |
+ UPSTREAM_VER=3 |
| 56 |
SECURITY_VER=28 |
| 57 |
# xen-tools's gentoo patches tarball |
| 58 |
- GENTOO_VER=22 |
| 59 |
+ GENTOO_VER=21 |
| 60 |
# xen-tools's gentoo patches version which apply to this specific ebuild |
| 61 |
GENTOO_GPV=0 |
| 62 |
# xen-tools ovmf's patches |
| 63 |
OVMF_VER= |
| 64 |
|
| 65 |
- SEABIOS_VER="1.13.0" |
| 66 |
+ SEABIOS_VER="1.12.1" |
| 67 |
EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54" |
| 68 |
EDK2_OPENSSL_VERSION="1_1_1b" |
| 69 |
EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" |
| 70 |
@@ -277,11 +277,6 @@ src_prepare() { |
| 71 |
echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die |
| 72 |
fi |
| 73 |
|
| 74 |
- # gcc 10 |
| 75 |
- # libxlu_pci.c:32:18: error: 'func' may be used uninitialized in this function |
| 76 |
- sed -e '/CFLAGS/s/Werror/Wno-error/g' \ |
| 77 |
- -i tools/libxl/Makefile || die |
| 78 |
- |
| 79 |
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die |
| 80 |
|
| 81 |
# Fix texi2html build error with new texi2html, qemu.doc.html |
| 82 |
|
| 83 |
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0-r2.ebuild |
| 84 |
similarity index 99% |
| 85 |
rename from app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild |
| 86 |
rename to app-emulation/xen-tools/xen-tools-4.14.0-r2.ebuild |
| 87 |
index 7cf7cb407e7..6e50b8d46e3 100644 |
| 88 |
--- a/app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild |
| 89 |
+++ b/app-emulation/xen-tools/xen-tools-4.14.0-r2.ebuild |
| 90 |
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then |
| 91 |
S="${WORKDIR}/${REPO}" |
| 92 |
else |
| 93 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 94 |
- UPSTREAM_VER=0 |
| 95 |
+ UPSTREAM_VER=1 |
| 96 |
SECURITY_VER=28 |
| 97 |
# xen-tools's gentoo patches tarball |
| 98 |
GENTOO_VER=22 |
Archives