From 2bde8c744cbe420f2e85af7a63782bb89ca6da06 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 2 Jul 2023 19:02:29 +0200 Subject: [PATCH] package/xvisor: bump to version 0.3.2 For change log since version 0.3.1, see: https://www.xhypervisor.org/index.php?page=news/20230101 or https://github.com/xvisor/xvisor/blob/master/docs/releases/v0.3.2 This commit also drop the patch, as an equivalent fix, included in this version, was made upstream in: https://github.com/xvisor/xvisor/commit/eb1d1dd4658c2bab6c49abb7bc51c231dc5cc0bd The file .checkpackageignore is also updated to reflect this patch removal. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...psmouse-back.c-fix-build-with-gcc-11.patch | 115 ------------------ package/xvisor/xvisor.hash | 2 +- package/xvisor/xvisor.mk | 2 +- 4 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0f6bdd92fa..a48712460f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1660,7 +1660,6 @@ package/xinetd/0004-configure-rlim_t.patch Upstream package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream package/xl2tp/xl2tpd TrailingSpace package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream -package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch Upstream package/xxhash/0001-fix-man-page-installation.patch Upstream package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream diff --git a/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch deleted file mode 100644 index 1c02f45c9d..0000000000 --- a/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 0e07e82121697d99470a147eadad9a708889c4df Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 2 Sep 2021 18:13:03 +0200 -Subject: [PATCH] psmouse-back.c: fix build with gcc 11 - -Fix the following build failures with gcc 11 by defining inline -functions as static: - -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/build/drivers/drivers.o: in function `psmouse_extensions': -/home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `lifebook_detect' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `alps_detect' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `ps2pp_init' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `trackpoint_detect' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `fsp_detect' - -Fixes: - - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xvisor/xvisor/pull/139] ---- - drivers/input/mouse/alps.h | 4 ++-- - drivers/input/mouse/lifebook.h | 6 +++--- - drivers/input/mouse/logips2pp.h | 2 +- - drivers/input/mouse/sentelic.h | 4 ++-- - drivers/input/mouse/trackpoint.h | 2 +- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h -index ae1ac354..acc1e89e 100644 ---- a/drivers/input/mouse/alps.h -+++ b/drivers/input/mouse/alps.h -@@ -51,11 +51,11 @@ struct alps_data { - int alps_detect(struct psmouse *psmouse, bool set_properties); - int alps_init(struct psmouse *psmouse); - #else --inline int alps_detect(struct psmouse *psmouse, bool set_properties) -+static inline int alps_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --inline int alps_init(struct psmouse *psmouse) -+static inline int alps_init(struct psmouse *psmouse) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h -index 4c4326c6..0baf02a7 100644 ---- a/drivers/input/mouse/lifebook.h -+++ b/drivers/input/mouse/lifebook.h -@@ -16,14 +16,14 @@ void lifebook_module_init(void); - int lifebook_detect(struct psmouse *psmouse, bool set_properties); - int lifebook_init(struct psmouse *psmouse); - #else --inline void lifebook_module_init(void) -+static inline void lifebook_module_init(void) - { - } --inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) -+static inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --inline int lifebook_init(struct psmouse *psmouse) -+static inline int lifebook_init(struct psmouse *psmouse) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h -index 0c186f02..439e9c58 100644 ---- a/drivers/input/mouse/logips2pp.h -+++ b/drivers/input/mouse/logips2pp.h -@@ -14,7 +14,7 @@ - #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP - int ps2pp_init(struct psmouse *psmouse, bool set_properties); - #else --inline int ps2pp_init(struct psmouse *psmouse, bool set_properties) -+static inline int ps2pp_init(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h -index aa697ece..42df9e3b 100644 ---- a/drivers/input/mouse/sentelic.h -+++ b/drivers/input/mouse/sentelic.h -@@ -123,11 +123,11 @@ struct fsp_data { - extern int fsp_detect(struct psmouse *psmouse, bool set_properties); - extern int fsp_init(struct psmouse *psmouse); - #else --inline int fsp_detect(struct psmouse *psmouse, bool set_properties) -+static inline int fsp_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --inline int fsp_init(struct psmouse *psmouse) -+static inline int fsp_init(struct psmouse *psmouse) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h -index e558a709..f14e59c0 100644 ---- a/drivers/input/mouse/trackpoint.h -+++ b/drivers/input/mouse/trackpoint.h -@@ -145,7 +145,7 @@ struct trackpoint_data - #ifdef CONFIG_MOUSE_PS2_TRACKPOINT - int trackpoint_detect(struct psmouse *psmouse, bool set_properties); - #else --inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties) -+static inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --- -2.32.0 - diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash index 45b6fec49c..4676db9e8c 100644 --- a/package/xvisor/xvisor.hash +++ b/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 b1bb2ca09340e87a2f465c65196892cdd0f59b798794ae69e35d1f883cf9ba49 xvisor-0.3.1.tar.xz +sha256 fbced0f74b75758d4859d329b86c213bd24662168179ebfb2b02b987a1070215 xvisor-0.3.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index d7bb288ea8..eba37be9b7 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XVISOR_VERSION = 0.3.1 +XVISOR_VERSION = 0.3.2 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+