[Buildroot] [PATCH 1/1] package/xvisor: bump to version 0.3.1

* [Buildroot] [PATCH 1/1] package/xvisor: bump to version 0.3.1
@ 2022-01-24 17:25 Fabrice Fontaine
  2022-01-24 21:06 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-01-24 17:25 UTC (permalink / raw)
  To: buildroot; +Cc: Eric Le Bihan, Fabrice Fontaine

- Drop first patch (already in version)
- Send second patch upstream

http://xhypervisor.org/index.php?page=news/20211220

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../xvisor/0001-fix-build-with-gcc-10.patch   | 64 -------------------
 ...smouse-back.c-fix-build-with-gcc-11.patch} |  1 +
 package/xvisor/xvisor.hash                    |  2 +-
 package/xvisor/xvisor.mk                      |  2 +-
 4 files changed, 3 insertions(+), 66 deletions(-)
 delete mode 100644 package/xvisor/0001-fix-build-with-gcc-10.patch
 rename package/xvisor/{0002-psmouse-back.c-fix-build-with-gcc-11.patch => 0001-psmouse-back.c-fix-build-with-gcc-11.patch} (98%)

diff --git a/package/xvisor/0001-fix-build-with-gcc-10.patch b/package/xvisor/0001-fix-build-with-gcc-10.patch
deleted file mode 100644
index a538558d86..0000000000
--- a/package/xvisor/0001-fix-build-with-gcc-10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 6 Oct 2020 21:52:20 +0200
-Subject: [PATCH] fix build with gcc 10
-
-Define variables in header files as extern to avoid the following build failure
-with gcc 10 (which defaults to -fno-common):
-
-/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld:
-/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67:
-multiple definition of `sdio_func_type';
-/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67:
-first defined here
-
-Fixes:
- - http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/xvisor/xvisor/pull/125]
----
- drivers/mmc/core/core.h    |  2 +-
- emulators/display/drawfn.h | 10 +++++-----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
-index d75d135a..e2ca3141 100644
---- a/drivers/mmc/core/core.h
-+++ b/drivers/mmc/core/core.h
-@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host);
-  * Note: Must be called with host->lock held.
-  */
- extern struct vmm_bus sdio_bus_type;
--struct vmm_device_type sdio_func_type;
-+extern struct vmm_device_type sdio_func_type;
- 
- int __sdio_attach(struct mmc_host *host);
- 
-diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h
-index f9163cff..385deaf6 100644
---- a/emulators/display/drawfn.h
-+++ b/emulators/display/drawfn.h
-@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *,
- 				 DRAWFN_ORDER_MAX * \
- 				 DRAWFN_FORMAT_MAX)
- 
--drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE];
-+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE];
- 
--drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE];
-+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE];
- 
--drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE];
-+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE];
- 
--drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE];
-+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE];
- 
--drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE];
-+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE];
- 
- #endif
--- 
-2.28.0
-
diff --git a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch
similarity index 98%
rename from package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch
rename to package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch
index 28010034d6..1c02f45c9d 100644
--- a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch
+++ b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch
@@ -17,6 +17,7 @@ Fixes:
  - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/xvisor/xvisor/pull/139]
 ---
  drivers/input/mouse/alps.h       | 4 ++--
  drivers/input/mouse/lifebook.h   | 6 +++---
diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash
index 6938e20e7b..45b6fec49c 100644
--- a/package/xvisor/xvisor.hash
+++ b/package/xvisor/xvisor.hash
@@ -1,3 +1,3 @@
 # Locally generated
-sha256  81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05  xvisor-0.3.0.tar.xz
+sha256  b1bb2ca09340e87a2f465c65196892cdd0f59b798794ae69e35d1f883cf9ba49  xvisor-0.3.1.tar.xz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk
index 394ff7c80b..dc49258400 100644
--- a/package/xvisor/xvisor.mk
+++ b/package/xvisor/xvisor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XVISOR_VERSION = 0.3.0
+XVISOR_VERSION = 0.3.1
 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz
 XVISOR_SITE = http://www.xhypervisor.org/tarball
 XVISOR_LICENSE = GPL-2.0+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread