qemuwrapper: Don't use STAGING_BINDIR_CROSS directly

We need the files to be tracked by sstate so we need to jump through
some hoops to ensure this happens. The cross bindir directory
isn't staged automatically so we need to handle this outselves.

(From OE-Core rev: 743d5233747d0a107490b31ea3da151ea1ace3ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 10 insertions, 4 deletions

diff --git a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
index dc16047451..f23a7d7962 100644
--- a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
@@ -6,9 +6,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 inherit qemu
 
 do_install () {
-    install -d ${STAGING_BINDIR_CROSS}
+        install -d ${D}${bindir_crossscripts}/
 
-    echo "#!/bin/sh" > ${STAGING_BINDIR_CROSS}/qemuwrapper
-    echo exec env ${@qemu_target_binary(d)} \"\$@\" >> ${STAGING_BINDIR_CROSS}/qemuwrapper
-    chmod +x ${STAGING_BINDIR_CROSS}/qemuwrapper
+        echo "#!/bin/sh" > ${D}${bindir_crossscripts}/qemuwrapper
+        echo exec env ${@qemu_target_binary(d)} \"\$@\" >> ${D}${bindir_crossscripts}/qemuwrapper
+        chmod +x ${D}${bindir_crossscripts}/qemuwrapper
+}
+
+SYSROOT_PREPROCESS_FUNCS += "qemuwrapper_sysroot_preprocess"
+
+qemuwrapper_sysroot_preprocess () {
+        sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
 }