From: Alistair Francis Date: Sun, 16 Aug 2020 02:53:07 +0000 (-0700) Subject: package/xen: bump version to 4.14.0 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=514bbb8520493f69a59dcbfe2ea7f8083d3e5a58;p=buildroot.git package/xen: bump version to 4.14.0 Bump the Xen package to the latest release. We can also remove a patch to change the CFLAGS as it is no longer required. The hash of the license file is changed, as ZPL-2.0 is no longer listed as one of the licenses of 3rd party code imported into Xen. Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- diff --git a/package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch b/package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch new file mode 100644 index 0000000000..b681b941f7 --- /dev/null +++ b/package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch @@ -0,0 +1,43 @@ +Message-Id: <07010a2ad79559c412949f0005dbe3cb03d8416e.1498504812.git.ps@pks.im> +From: Patrick Steinhardt +Date: Mon, 26 Jun 2017 21:20:45 +0200 +Subject: [PATCH] 9pfs: include for XATTR_SIZE_MAX + +The function `v9fs_xattrcreate` makes use of the define `XATTR_SIZE_MAX` +to reject attempts of creating xattrs with an invalid size, which is +defined in . On glibc-based systems, this header is +indirectly included via , , +, but on other platforms this is not guaranteed due +to not being part of the POSIX standard. One examples are systems based +on musl libc, which do not include the indirectly, +which leads to `XATTR_SIZE_MAX` being undefined. + +Fix this error by directly include . As the 9P fs code +is being Linux-based either way, we can simply do so without breaking +other platforms. This enables building 9pfs on musl-based systems. + +Signed-off-by: Patrick Steinhardt +[ Changes by AF + - Apply to the QEMU tree inside of Xen +] +Signed-off-by: Alistair Francis +--- +Upstream Status: Pending review and acceptance + + tools/qemu-xen/hw/9pfs/9p.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/qemu-xen/hw/9pfs/9p.c b/tools/qemu-xen/hw/9pfs/9p.c +index 96d2683348..48cd558e96 100644 +--- a/tools/qemu-xen/hw/9pfs/9p.c ++++ b/tools/qemu-xen/hw/9pfs/9p.c +@@ -13,6 +13,7 @@ + + #include "qemu/osdep.h" + #include ++#include + #include "hw/virtio/virtio.h" + #include "qapi/error.h" + #include "qemu/error-report.h" +-- +2.13.2 diff --git a/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch deleted file mode 100644 index fb316739b4..0000000000 --- a/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8aea14bbd20b04b8fffaf35138ebdcbd39e433a3 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 29 Oct 2016 16:35:26 +0200 -Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment - -When CFLAGS are passed from the environment, the first-level make -invocation will append -D__OBJECT_FILE__ to it, then call a second -make invocation, that will have those new CFLAGS in its environment, -but will also append -D__OBJECT_FILE__ to those. - -Then, the compiler fails because __OBEJECT_FILE__ is defined twice. - -Just undefine it before defining it again, as a *workaround* to this -issue. - -Signed-off-by: "Yann E. MORIN" ---- - xen/Rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xen/Rules.mk b/xen/Rules.mk -index 3090ea7828..d535bf9e2f 100644 ---- a/xen/Rules.mk -+++ b/xen/Rules.mk -@@ -61,7 +61,7 @@ CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith - $(call cc-option-add,CFLAGS,CC,-Wvla) - CFLAGS += -pipe -D__XEN__ -include $(BASEDIR)/include/xen/config.h - CFLAGS-$(CONFIG_DEBUG_INFO) += -g --CFLAGS += '-D__OBJECT_FILE__="$@"' -+CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' - - ifneq ($(clang),y) - # Clang doesn't understand this command line argument, and doesn't appear to --- -2.22.0 - diff --git a/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch b/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch deleted file mode 100644 index b681b941f7..0000000000 --- a/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch +++ /dev/null @@ -1,43 +0,0 @@ -Message-Id: <07010a2ad79559c412949f0005dbe3cb03d8416e.1498504812.git.ps@pks.im> -From: Patrick Steinhardt -Date: Mon, 26 Jun 2017 21:20:45 +0200 -Subject: [PATCH] 9pfs: include for XATTR_SIZE_MAX - -The function `v9fs_xattrcreate` makes use of the define `XATTR_SIZE_MAX` -to reject attempts of creating xattrs with an invalid size, which is -defined in . On glibc-based systems, this header is -indirectly included via , , -, but on other platforms this is not guaranteed due -to not being part of the POSIX standard. One examples are systems based -on musl libc, which do not include the indirectly, -which leads to `XATTR_SIZE_MAX` being undefined. - -Fix this error by directly include . As the 9P fs code -is being Linux-based either way, we can simply do so without breaking -other platforms. This enables building 9pfs on musl-based systems. - -Signed-off-by: Patrick Steinhardt -[ Changes by AF - - Apply to the QEMU tree inside of Xen -] -Signed-off-by: Alistair Francis ---- -Upstream Status: Pending review and acceptance - - tools/qemu-xen/hw/9pfs/9p.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/qemu-xen/hw/9pfs/9p.c b/tools/qemu-xen/hw/9pfs/9p.c -index 96d2683348..48cd558e96 100644 ---- a/tools/qemu-xen/hw/9pfs/9p.c -+++ b/tools/qemu-xen/hw/9pfs/9p.c -@@ -13,6 +13,7 @@ - - #include "qemu/osdep.h" - #include -+#include - #include "hw/virtio/virtio.h" - #include "qapi/error.h" - #include "qemu/error-report.h" --- -2.13.2 diff --git a/package/xen/xen.hash b/package/xen/xen.hash index ab5f9d9083..709eeb3d45 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b97ce363e55b12c992063f4466c43cba0a6386ceb7a747b4dc670311f337ef01 xen-4.13.1.tar.gz -sha256 36b91794c6d4a678137c70c41e384c03b552c7efba82c0d73e6be842e41ab3d3 COPYING +sha256 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035 xen-4.14.0.tar.gz +sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 15742b5127..a30e80e5e7 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.13.1 +XEN_VERSION = 4.14.0 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING