qemu-xilinx-helper-native: Remove, replace with standard upstream version

qemu-system-helper contains support for general system items, there is no
reason for us to provide our own version.  We can then add a dependency for
the specific xilinx multiarch component as needed to the system-native
versions.

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

6 files changed, 3 insertions, 24 deletions

diff --git a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
index 58ade1b9..3835591d 100644
--- a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
@@ -136,13 +136,3 @@ def qemu_zynqmp_unhalt(data, multiarch):
     if multiarch:
         return "-global xlnx,zynqmp-boot.cpu-num=0 -global xlnx,zynqmp-boot.use-pmufw=true"
     return "-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4"
-
-# rewrite the qemuboot with the custom sysroot bindir
-python do_write_qemuboot_conf:append() {
-    val = os.path.join(d.getVar('BASE_WORKDIR'), d.getVar('BUILD_SYS'), 'qemu-xilinx-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/')
-    cf.set('config_bsp', 'STAGING_BINDIR_NATIVE', '%s' % val)
-
-    # write out the updated version from this append
-    with open(qemuboot, 'w') as f:
-        cf.write(f)
-}
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
index 7b953975..2f2c20e3 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
@@ -1,7 +1,6 @@
 # This include is used to setup default QEMU and qemuboot config for meta-xilinx
 # machines.
 
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
 PREFERRED_PROVIDER_qemu = "qemu-xilinx"
 PREFERRED_PROVIDER_qemu-native = "qemu-xilinx-native"
 PREFERRED_PROVIDER_qemu-system-native = "qemu-xilinx-system-native"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
deleted file mode 100644
index dd47f7a7..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS:prepend := "${COREBASE}/meta/recipes-devtools/qemu/qemu-helper:"
-
-require ${COREBASE}/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
-
-# provide it, to replace the existing recipe
-PROVIDES = "qemu-helper-native"
-
-# replace qemu with qemu-xilinx
-DEPENDS:remove = "qemu-system-native"
-DEPENDS:append = " qemu-xilinx-system-native qemu-xilinx-multiarch-helper-native"
-
-RDEPENDS:${PN}:remove = "qemu-system-native"
-RDEPENDS:${PN}:append = " qemu-xilinx-system-native"
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 9a420021..d67b401d 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
@@ -10,6 +10,7 @@ PACKAGECONFIG ??= "fdt alsa kvm pie slirp"
 PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
 
 DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native"
+DEPENDS += "qemu-xilinx-multiarch-helper-native"
 
 do_install:append() {
     # The following is also installed by qemu-native
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 3a8eadc4..8cef3db2 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
@@ -10,6 +10,7 @@ PACKAGECONFIG ??= "fdt alsa kvm pie slirp"
 PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
 
 DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native"
+DEPENDS += "qemu-xilinx-multiarch-helper-native"
 
 do_install:append() {
     # The following is also installed by qemu-native
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 a0b889b7..1fb51cdd 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
@@ -11,6 +11,7 @@ PACKAGECONFIG ??= "fdt alsa kvm pie slirp"
 PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
 
 DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native"
+DEPENDS += "qemu-xilinx-multiarch-helper-native"
 
 do_install:append() {
     # The following is also installed by qemu-native