commit:     7d548908720c3ebb30ac675172a029947a74b590
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Jul 24 15:49:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 16:22:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d548908

app-emulation/xen-tools: bump to 4.14.0, drop rc

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-emulation/xen-tools/Manifest                                  | 2 +-
 app-emulation/xen-tools/files/gentoo-patches.conf                 | 2 +-
 .../{xen-tools-4.14.0_rc3.ebuild => xen-tools-4.14.0.ebuild}      | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 392c6fb80f6..80a0134ce8e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -12,6 +12,6 @@ DIST xen-4.12.3-upstream-patches-1.tar.xz 39052 BLAKE2B 
dbe18a8d67009be9597ea8f0
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 
403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef
 SHA512 
7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1-upstream-patches-1.tar.xz 46892 BLAKE2B 
8ccfe1d6b3589e262fa04526d5238694e324fef3b514daebdffcb74cecfc2700e37f810faf868ec198c99ed3a9af2c351656c31798c5791bfd6816552d78fd7a
 SHA512 
2d9708c4b558c5986afd1caea56f69ac8b11d69371fd4afae0e9c3480a0b863c99ebe2d3b857d623d41924437db7f7e44fefc7bae892cd05d7605243ae8140d5
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B 
efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95
 SHA512 
b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 
12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2
 SHA512 
c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
+DIST xen-4.14.0.tar.gz 39950576 BLAKE2B 
db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71
 SHA512 
ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 
95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1
 SHA512 
3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B 
e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3
 SHA512 
5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf 
b/app-emulation/xen-tools/files/gentoo-patches.conf
index 472d8b7b3b8..0a0bf8aa468 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -74,7 +74,7 @@ ${_gx060}
 "
 
 # xen-tools-4.14.0 patches set
-_gpv_xen_tools_4140_rc3_0="
+_gpv_xen_tools_4140_0="
 ${_gx039}
 ${_gx027}
 ${_gx028} ${_gx029}

diff --git a/app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild 
b/app-emulation/xen-tools/xen-tools-4.14.0.ebuild
similarity index 98%
rename from app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
rename to app-emulation/xen-tools/xen-tools-4.14.0.ebuild
index d629c533489..6446bb397cf 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.0.ebuild
@@ -16,8 +16,7 @@ if [[ $PV == *9999 ]]; then
        EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
        S="${WORKDIR}/${REPO}"
 else
-       #KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       KEYWORDS=""
+       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
        UPSTREAM_VER=
        SECURITY_VER=
        # xen-tools's gentoo patches tarball
@@ -277,6 +276,11 @@ src_prepare() {
                echo ipxe-gcc10.patch >> 
tools/firmware/etherboot/patches/series || die
        fi
 
+       # gcc 10
+       # libxlu_pci.c:32:18: error: 'func' may be used uninitialized in this 
function
+       sed -e '/CFLAGS/s/Werror/Wno-error/g' \
+               -i tools/libxl/Makefile || die
+
        mv tools/qemu-xen/qemu-bridge-helper.c 
tools/qemu-xen/xen-bridge-helper.c || die
 
        # Fix texi2html build error with new texi2html, qemu.doc.html

Reply via email to