qemu: Fix qemu integration with master

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

3 files changed, 6 insertions, 0 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 36f445ac..10771360 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -52,6 +52,7 @@ PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVa
 PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%"
+PREFERRED_PROVIDER_qemu ?= "qemu-xilinx"
 
 XILINX_ATF_VERSION[v2022.1] = "2.6-xilinx-v2022.1%"
 XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc
index 06ac05a1..362a7dbe 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc
@@ -1,3 +1,5 @@
 XILINX_QEMU_VERSION = "v7.1.0"
 BRANCH = "xlnx_rel_v2023.1"
 SRCREV = "21adc9f99e813fb24fb65421259b5b0614938376"
+
+PACKAGECONFIG[debuginfo] = ""
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc
index c8f593a7..bf7ad610 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc
@@ -49,4 +49,7 @@ PACKAGECONFIG ??= " \
 "
 PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm gcrypt pie slirp"
 
+# Disable this
+PACKAGECONFIG[debuginfo] = ""
+
 DISABLE_STATIC:pn-${PN} = ""