From d925a82f3631bd20648a91bc23d5746e457c9b8b Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 22 Jan 2024 16:16:51 -0700 Subject: meta-xilinx-core: virtualization_layer: qemu Rework the meta-virtualization qemu extensions implemented in the meta-xilinx-core layer. It was found that is a bug in the langdale meta-virtualization. Due to this, we need to use BBMASK to exclude the changes from that layer, and then repeat them, but only for qemu 7.1. qemu 8.1 work is taken from the current master version of meta-virtualization. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-xilinx-core/conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 5f2693cb..bbad1f76 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -46,6 +46,9 @@ XILINX_RELEASE_VERSION ??= "v2024.1" BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION" +# Workaround for a bbappend bug in meta-virtualization (fixed in scarthgap) +BBMASK += "/meta-virtualization/recipes-devtools/qemu/" + XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%" XILINX_QEMU_VERSION[v2023.2] = "v7.1.0-xilinx-v2023.2%" XILINX_QEMU_VERSION[v2024.1] = "v8.1.0-xilinx-v2024.1%" -- cgit v1.2.3-54-g00ecf