commit: cb9316c500e660407677b987a4a36f333d86b464 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Jul 15 18:26:17 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Jul 16 07:39:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb9316c5
app-emulation/xen-tools: remove unused patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/26424 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-emulation/xen-tools/files/gentoo-patches.conf | 87 ------------------ ...-tools-4.15.0-fix-xenstat-python-bindings.patch | 18 ---- .../files/xen-tools-4.15.1-edk2-python3.9.patch | 26 ------ .../files/xen-tools-4.15.1-ocaml-4.12.patch | 101 --------------------- 4 files changed, 232 deletions(-) diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf deleted file mode 100644 index d6fce26a06c0..000000000000 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ /dev/null @@ -1,87 +0,0 @@ -# Bug 496708 -_gx045=" xen-tools-4.10.1-unbundle-ipxe.patch" -_gx054=" xen-tools-4.12.0-unbundle-ipxe.patch" - -# Bug 379537 -_gx017=" fix-gold-ld.patch" - -# Bug 477676 -_gx038=" xen-tools-4.8-ar-cc.patch" -_gx039=" xen-tools-4.14-ar-cc.patch" - -# Prevent file collision with qemu package Bug 478064 -_gx043=" xen-4.10-qemu-bridge.patch" -_gx051=" xen-4.12-qemu-bridge.patch" -_gx052=" xen-tools-4.14-qemu-bridge.patch" -#mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - -# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302 -_gx027=" xen-tools-4-qemu-fix-po-collision.patch" - -# Fix build failure with ncurses[tinfo], bug 526526 -_gx028=" xen-tools-4.4.1-tinfo.patch" - -# Don't download ovmf, use pre-released -_gx029=" xen-tools-4-anti-ovmf-download.patch" - -# increase stack to fix xenqemu err -# https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03961.html -_gx037=" xen-tools-4.6-increase-stack-size.patch" - -#Fix missing makedev(), major(), minor() -_gx042=" xen-tools-4.8.2-makedev.patch" - -# Disable failing shim -_gx046=" xen-tools-4.10.1-shim.patch" -_gx050=" xen-tools-4.12.0-shim.patch" - -# Fix building with gcc 8, bug #657388 -_gx048=" xen-tools-4.11.1-gcc8.patch" -_gx053=" xen-tools-4.12.0-gcc8.patch" - -# Fix building with gcc 9, bug #689082 -_gx055=" xen-tools-4.11.2-gcc9.patch" - -# Fix pdf document generation, bug #650396 -_gx049=" xen-tools-4.10.1-pdfdoc.patch" - -# Add xenstat python-binding, Gento Bug #711066 -_gx056=" xen-tools-4.12.2-libxenstat-makefile.patch" - -# Fix building with gcc 10, bug #722930 -_gx060=" xen-tools-4.13.0-gcc10.patch" - -# xen-tools-4.15.1 patches set -_gpv_xen_tools_4151_0=" - xen-tools-4.14-ar-cc.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.15.0-libxenstat-makefile.patch - xen-tools-4.15.0-qemu-bridge.patch - xen-tools-4.15.0-unbundle-ipxe.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4-anti-ovmf-download.patch - xen-tools-4-qemu-fix-po-collision.patch -" - -# xen-tools-4.15.2 patches set -_gpv_xen_tools_4152_0=" - xen-tools-4.14-ar-cc.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.15.0-libxenstat-makefile.patch - xen-tools-4.15.0-qemu-bridge.patch - xen-tools-4.15.0-unbundle-ipxe.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4-anti-ovmf-download.patch - xen-tools-4-qemu-fix-po-collision.patch -" - -# xen-tools-4.16.0 patches set -_gpv_xen_tools_4160_0=" - xen-tools-4.14-ar-cc.patch - xen-tools-4.15.0-disable-werror.patch - xen-tools-4.15.0-unbundle-ipxe.patch - xen-tools-4.16.0-qemu-bridge.patch - xen-tools-4.16.0-xenstat.patch - xen-tools-4.4.1-tinfo.patch - xen-tools-4-anti-ovmf-download.patch -" diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch b/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch deleted file mode 100644 index 3547b7346eed..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/tools/libs/stat/Makefile 2021-07-01 19:32:50.696318503 +0200 -+++ b/tools/libs/stat/Makefile 2021-07-01 00:16:15.102473301 +0200 -@@ -51,12 +51,13 @@ - .PHONY: uninstall-bindings - uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings - --$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h -+$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h - --SWIG_FLAGS=-module xenstat -Iinclude -I. -+SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/ - - # Python bindings - PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'` -+PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat - $(PYMOD): $(PYSRC) - $(PYSRC): bindings/swig/xenstat.i - swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $< diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch deleted file mode 100644 index a1f8d155434e..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py -index ad556710802e..4be7957138a5 100755 ---- a/BaseTools/Source/Python/Common/Misc.py -+++ b/BaseTools/Source/Python/Common/Misc.py -@@ -1635,7 +1635,7 @@ def __init__(self, PeFile): - ByteArray = array.array('B') - ByteArray.fromfile(PeObject, 4) - # PE signature should be 'PE\0\0' -- if ByteArray.tostring() != b'PE\0\0': -+ if ByteArray.tolist() != [ord('P'), ord('E'), 0, 0]: - self.ErrorInfo = self.FileName + ' has no valid PE signature PE00' - return - -diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py -index b2895f7e5c63..883c2356e0ca 100644 ---- a/BaseTools/Source/Python/AutoGen/UniClassObject.py -+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py -@@ -152,7 +152,7 @@ def encode(self, input, errors='strict'): - - TheUcs2Codec = Ucs2Codec() - def Ucs2Search(name): -- if name == 'ucs-2': -+ if name in ['ucs-2', 'ucs_2']: - return codecs.CodecInfo( - name=name, - encode=TheUcs2Codec.encode, diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch deleted file mode 100644 index b06a7f195bfa..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 2d1a35f1e6c2113a6322fdb758a198608c90e4bd Mon Sep 17 00:00:00 2001 -From: Costin Lupu <costin.l...@cs.pub.ro> -Date: Tue, 8 Jun 2021 15:35:29 +0300 -Subject: [PATCH] tools/ocaml: Fix redefinition errors - -If PAGE_SIZE is already defined in the system (e.g. in /usr/include/limits.h -header) then gcc will trigger a redefinition error because of -Werror. This -patch replaces usage of PAGE_* macros with XC_PAGE_* macros in order to avoid -confusion between control domain page granularity (PAGE_* definitions) and -guest domain page granularity (which is what we are dealing with here). - -Same issue applies for redefinitions of Val_none and Some_val macros which -can be already define in the OCaml system headers (e.g. -/usr/lib/ocaml/caml/mlvalues.h). - -Signed-off-by: Costin Lupu <costin.l...@cs.pub.ro> -Reviewed-by: Julien Grall <jgr...@amazon.com> -Acked-by: Ian Jackson <i...@xenproject.org> -Tested-by: Dario Faggioli <dfaggi...@suse.com> ---- - tools/ocaml/libs/xc/xenctrl_stubs.c | 10 ++++------ - tools/ocaml/libs/xentoollog/xentoollog_stubs.c | 4 ++++ - tools/ocaml/libs/xl/xenlight_stubs.c | 4 ++++ - 3 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c -index 6e4bc567f5..a6756c4a8c 100644 ---- a/tools/ocaml/libs/xc/xenctrl_stubs.c -+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c -@@ -37,14 +37,12 @@ - - #include "mmap_stubs.h" - --#define PAGE_SHIFT 12 --#define PAGE_SIZE (1UL << PAGE_SHIFT) --#define PAGE_MASK (~(PAGE_SIZE-1)) -- - #define _H(__h) ((xc_interface *)(__h)) - #define _D(__d) ((uint32_t)Int_val(__d)) - -+#ifndef Val_none - #define Val_none (Val_int(0)) -+#endif - - #define string_of_option_array(array, index) \ - ((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0))) -@@ -819,7 +817,7 @@ CAMLprim value stub_xc_domain_memory_increase_reservation(value xch, - CAMLparam3(xch, domid, mem_kb); - int retval; - -- unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (PAGE_SHIFT - 10); -+ unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (XC_PAGE_SHIFT - 10); - - uint32_t c_domid = _D(domid); - caml_enter_blocking_section(); -@@ -925,7 +923,7 @@ CAMLprim value stub_pages_to_kib(value pages) - { - CAMLparam1(pages); - -- CAMLreturn(caml_copy_int64(Int64_val(pages) << (PAGE_SHIFT - 10))); -+ CAMLreturn(caml_copy_int64(Int64_val(pages) << (XC_PAGE_SHIFT - 10))); - } - - -diff --git a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c -index bf64b211c2..e4306a0c2f 100644 ---- a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c -+++ b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c -@@ -53,8 +53,12 @@ static char * dup_String_val(value s) - #include "_xtl_levels.inc" - - /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ -+#ifndef Val_none - #define Val_none Val_int(0) -+#endif -+#ifndef Some_val - #define Some_val(v) Field(v,0) -+#endif - - static value Val_some(value v) - { -diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c -index 352a00134d..45b8af61c7 100644 ---- a/tools/ocaml/libs/xl/xenlight_stubs.c -+++ b/tools/ocaml/libs/xl/xenlight_stubs.c -@@ -227,8 +227,12 @@ static value Val_string_list(libxl_string_list *c_val) - } - - /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ -+#ifndef Val_none - #define Val_none Val_int(0) -+#endif -+#ifndef Some_val - #define Some_val(v) Field(v,0) -+#endif - - static value Val_some(value v) - { --- -2.30.2 -
