3 files changed, 38 insertions, 43 deletions

diff --git a/recipes-extended/xvisor/files/0001-build-use-usr-bin-env-for-python-scripts.patch b/recipes-extended/xvisor/files/0001-build-use-usr-bin-env-for-python-scripts.patch
deleted file mode 100644
index 1e37c49e..00000000
--- a/recipes-extended/xvisor/files/0001-build-use-usr-bin-env-for-python-scripts.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From eb351ca63a86f53cfb18987284a1445d543dfe56 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Mon, 29 Nov 2021 17:20:00 -0500
-Subject: [PATCH] build: use /usr/bin/env for python scripts
-
-Without this, we break on hosts without /usr/bin/python
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- tools/scripts/d2c.py    | 2 +-
- tools/scripts/memimg.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/scripts/d2c.py b/tools/scripts/d2c.py
-index b46a7bc4..0a6bce08 100755
---- a/tools/scripts/d2c.py
-+++ b/tools/scripts/d2c.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python3
- #/**
- # Copyright (c) 2013 Anup Patel.
- # All rights reserved.
-diff --git a/tools/scripts/memimg.py b/tools/scripts/memimg.py
-index 423c9c33..ba2f06cb 100755
---- a/tools/scripts/memimg.py
-+++ b/tools/scripts/memimg.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python3
- #/**
- # Copyright (c) 2011 Anup Patel.
- # All rights reserved.
--- 
-2.19.1
-
diff --git a/recipes-extended/xvisor/files/0001-vmm_types-drop-C99-defined-bool.patch b/recipes-extended/xvisor/files/0001-vmm_types-drop-C99-defined-bool.patch
new file mode 100644
index 00000000..d73488b2
--- /dev/null
+++ b/recipes-extended/xvisor/files/0001-vmm_types-drop-C99-defined-bool.patch
@@ -0,0 +1,30 @@
+From cc1b6f4a2d4de9b024048626096cabcd1a674d06 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Tue, 8 Jul 2025 13:35:29 -0400
+Subject: [PATCH] vmm_types: drop C99 defined 'bool'
+
+Upstream-Status: Inappropriate [Adapting to OE default compiler]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ core/include/vmm_types.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/core/include/vmm_types.h b/core/include/vmm_types.h
+index 70801c4f..7c1084f2 100644
+--- a/core/include/vmm_types.h
++++ b/core/include/vmm_types.h
+@@ -42,7 +42,9 @@ typedef long s64;
+ typedef unsigned long u64;
+ #endif
+ 
+-typedef unsigned int bool;
++// not needed for c99 and throws an error
++// typedef unsigned int bool;
++
+ /*
+  * Most 32 bit architectures use "unsigned int" size_t,
+  * and all 64 bit architectures use "unsigned long" size_t.
+-- 
+2.39.2
+
diff --git a/recipes-extended/xvisor/xvisor_git.bb b/recipes-extended/xvisor/xvisor_git.bb
index 1d6e79f9..097f1531 100644
--- a/recipes-extended/xvisor/xvisor_git.bb
+++ b/recipes-extended/xvisor/xvisor_git.bb
@@ -8,13 +8,12 @@ require xvisor-configs.inc
 
 inherit autotools-brokensep
 
-PV = "0.3.0+git"
+PV = "0.3.2+git"
 
 # This version support the RISC-V v0.5.0 Hypervisor extensions
-SRCREV = "6b23764a1439f9d08b2ed2f363da522460d8a22b"
-SRC_URI = "git://github.com/avpatel/xvisor-next.git;branch=master;protocol=https \
+SRCREV = "355c79a07d9c1b783962ebf47b9b18194b7d40bd"
+SRC_URI = "git://github.com/xvisor/xvisor.git;branch=master;protocol=https \
     file://0001-TESTS-Don-t-specify-mabi-or-march-for-RISC-V.patch \
-    file://0001-build-use-usr-bin-env-for-python-scripts.patch \
 "
 
 EXTRA_OEMAKE += "ARCH=\"${@map_xvisor_arch(d.getVar('TARGET_ARCH'), d)}\" I=${D}"
@@ -52,4 +51,8 @@ INHIBIT_PACKAGE_STRIP = "1"
 
 # ERROR: xvisor-git-r0 do_package_qa: QA Issue: File /vmm.elf in package xvisor doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags]
 # ERROR: xvisor-git-r0 do_package_qa: QA Issue: xvisor: ELF binary /vmm.elf has relocations in .text [textrel]
-INSANE_SKIP:${PN} += "ldflags textrel"
+# ERROR: xvisor-0.3.2+git-r0 do_package_qa: QA Issue: File /vmm.elf in package xvisor contains reference to TMPDIR [buildpaths]
+# ERROR: xvisor-0.3.2+git-r0 do_package_qa: QA Issue: File /vmm.bin in package xvisor contains reference to TMPDIR [buildpaths]
+# ERROR: xvisor-0.3.2+git-r0 do_package_qa: QA Issue: File /.debug/vmm.elf in package xvisor-dbg contains reference to TMPDIR [buildpaths]
+INSANE_SKIP:${PN} += "buildpaths ldflags textrel"
+INSANE_SKIP:${PN}-dbg += "buildpaths"