qemu-xilinx: Fix 2023.2 integration

Duplicate what was done in 2023.1 to allow qemu-xilinx to build.

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

4 files changed, 35 insertions, 0 deletions

diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc
index db6e1528..9831e1a5 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc
@@ -1,3 +1,5 @@
 XILINX_QEMU_VERSION = "v7.1.0"
 BRANCH = "xlnx_rel_v2023.2"
 SRCREV = "23b643ba1683a47ef49447a45643fe2172d6f8ca"
+
+PACKAGECONFIG[debuginfo] = ""
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.2.bb
index ccfa9956..6cc6e826 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.2.bb
@@ -4,6 +4,17 @@ require qemu-native-alt.inc
 
 BPN = "qemu-xilinx"
 
+# Latest poky has changed the defaults, restore them to something compatible
+# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
+EXTRA_OECONF:remove = "--disable-download"
+EXTRA_OECONF:remove = "--disable-docs"
+
+EXTRA_OECONF:append = "\
+    --with-git=/bin/false \
+    --with-git-submodules=ignore \
+    --meson=meson \
+"
+
 EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
 
 PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.2.bb
index 21208f72..3de49299 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.2.bb
@@ -4,6 +4,17 @@ require qemu-xilinx-native-7.1.inc
 
 PROVIDES = "qemu-system-native"
 
+# Latest poky has changed the defaults, restore them to something compatible
+# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
+EXTRA_OECONF:remove = "--disable-download"
+EXTRA_OECONF:remove = "--disable-docs"
+
+EXTRA_OECONF:append = "\
+    --with-git=/bin/false \
+    --with-git-submodules=ignore \
+    --meson=meson \
+"
+
 EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
 
 PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.2.bb
index e79df9d7..c0be61d3 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.2.bb
@@ -17,6 +17,17 @@ RDEPENDS:${PN}:class-target += "bash"
 PROVIDES:class-nativesdk = "nativesdk-qemu"
 RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu"
 
+# Latest poky has changed the defaults, restore them to something compatible
+# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
+EXTRA_OECONF:remove = "--disable-download"
+EXTRA_OECONF:remove = "--disable-docs"
+
+EXTRA_OECONF:append = "\
+    --with-git=/bin/false \
+    --with-git-submodules=ignore \
+    --meson=meson \
+"
+
 EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
 EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
 EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"