From: Bruce Ashfield <[email protected]> Bumping to the latest xvisor tip.
We drop one patch that is now part of the upstream, and we add another to remove /usr/bin/python from scripts called during build, since it breaks the build on hosts without /usr/bin/python. Signed-off-by: Bruce Ashfield <[email protected]> --- ...-Allow-Xvisor-to-compile-with-gcc-10.patch | 55 ------------------- ...d-use-usr-bin-env-for-python-scripts.patch | 36 ++++++++++++ recipes-extended/xvisor/xvisor_git.bb | 4 +- 3 files changed, 38 insertions(+), 57 deletions(-) delete mode 100644 recipes-extended/xvisor/files/0001-EMULATORS-Allow-Xvisor-to-compile-with-gcc-10.patch create mode 100644 recipes-extended/xvisor/files/0001-build-use-usr-bin-env-for-python-scripts.patch diff --git a/recipes-extended/xvisor/files/0001-EMULATORS-Allow-Xvisor-to-compile-with-gcc-10.patch b/recipes-extended/xvisor/files/0001-EMULATORS-Allow-Xvisor-to-compile-with-gcc-10.patch deleted file mode 100644 index 221a314..0000000 --- a/recipes-extended/xvisor/files/0001-EMULATORS-Allow-Xvisor-to-compile-with-gcc-10.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 417184cc41cfd33ae7b4c11c8396e0f47f43e2ba Mon Sep 17 00:00:00 2001 -From: Jean-Christophe Dubois <[email protected]> -Date: Fri, 8 May 2020 15:17:36 +0200 -Subject: [PATCH] EMULATORS: Allow Xvisor to compile with gcc 10. - -With gcc 10 because some header files do not declare some variable -definition as extern, the variable get duplicated in all files -using it. - -This patch allow xvisor to compile with the latest gcc. - -Signed-off-by: Jean-Christophe Dubois <[email protected]> -Reviewed-by: Anup Patel <[email protected]> ---- - 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 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 new file mode 100644 index 0000000..dfbb00b --- /dev/null +++ b/recipes-extended/xvisor/files/0001-build-use-usr-bin-env-for-python-scripts.patch @@ -0,0 +1,36 @@ +From eb351ca63a86f53cfb18987284a1445d543dfe56 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <[email protected]> +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 + +Signed-off-by: Bruce Ashfield <[email protected]> +--- + 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/xvisor_git.bb b/recipes-extended/xvisor/xvisor_git.bb index 749fec3..4d2a719 100644 --- a/recipes-extended/xvisor/xvisor_git.bb +++ b/recipes-extended/xvisor/xvisor_git.bb @@ -9,10 +9,10 @@ require xvisor-configs.inc inherit autotools-brokensep # This version support the RISC-V v0.5.0 Hypervisor extensions -SRCREV = "b3dac5b1f61f23f21dc59b3880897cff78f3b618" +SRCREV = "6b23764a1439f9d08b2ed2f363da522460d8a22b" SRC_URI = "git://github.com/avpatel/xvisor-next.git;branch=master;protocol=https \ file://0001-TESTS-Don-t-specify-mabi-or-march-for-RISC-V.patch \ - file://0001-EMULATORS-Allow-Xvisor-to-compile-with-gcc-10.patch \ + file://0001-build-use-usr-bin-env-for-python-scripts.patch \ " S = "${WORKDIR}/git" -- 2.32.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6937): https://lists.yoctoproject.org/g/meta-virtualization/message/6937 Mute This Topic: https://lists.yoctoproject.org/mt/87432344/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
