qemu-xilinx: Fix arguments that are not supported

--disable-download and --disable-docs does not yet exist in qemu 7.x.

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

9 files changed, 99 insertions, 0 deletions

diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb
index 42794f55..d3e1920a 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.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-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb
index e6a69f3a..586c0a7a 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.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-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb
index 06711fd9..796c4700 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.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_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb
index 6a2742bf..6b98c6a9 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.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-system-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb
index 1f02812d..fd4ddd40 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.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-system-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb
index 1e738530..09a7a5f5 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.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_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb
index 1622a919..e3ed8a2f 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.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)}"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb
index 9d3ad975..44be50c2 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb
@@ -15,6 +15,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)}"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb
index 3b12d161..fd7d3b4e 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.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)}"