qemu-xilinx-multiarch-helper-native_1.0.bb: Move multiarch wrapper script to bindir

Move the multiarch wrapper script from bindir/qemu-xilinx path to bindir
directory. All qemu targets have previously been moved from bindir/qemu-xilinx
to bindir.  Keep the paths consistent by moving the wrapper script to bindir.

Once the multiarch wrapper script is installed in bindir the binpath computed
within the script needs to be updated to find the qemu targets in the right
path. This will ensure that the APU and PMU instances are launched correctly.

Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>

2 files changed, 2 insertions, 3 deletions

diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch b/meta-xilinx-bsp/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
index 0f2b67e6..6f7fb522 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
@@ -6,9 +6,8 @@ import subprocess
 import sys
 import tempfile
 import shutil
-from pathlib import Path
 
-binpath = str(Path(os.path.dirname(os.path.abspath(__file__))).parent)
+binpath = os.path.dirname(os.path.abspath(__file__))
 mach_path = tempfile.mkdtemp()
 
 
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
index a9b11c6c..55cec776 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
@@ -15,6 +15,6 @@ do_compile[noexec] = "1"
 SYSROOT_DIRS += "${bindir}/qemu-xilinx"
 
 do_install() {
-        install -Dm 0755 ${WORKDIR}/qemu-system-aarch64-multiarch ${D}${bindir}/qemu-xilinx/qemu-system-aarch64-multiarch
+        install -Dm 0755 ${WORKDIR}/qemu-system-aarch64-multiarch ${D}${bindir}/qemu-system-aarch64-multiarch
 }