gem5/gem5-aarch64-native: use oe-run-native

Persist gem5 binary in native sysroot. This allows executing the binary
with the standard oe-run-native script. We can also remove the wrapper
creation and the ".real" versioning, since paths are setup by oe-run-native.

Change-Id: I9fd46725c78e1a09a7142a9d343b140bb5a77088
Signed-off-by: Adrian Herrera <adrian.herrera@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-gem5/recipes-devtools/gem5/files/start-gem5.sh

@@ -34,6 +34,6 @@ if [ -n "${GEM5_RUN_EXTRA}" ]; then
     args="$args ${GEM5_RUN_EXTRA}"
 fi
 
-${STAGING_BINDIR_NATIVE}/${GEM5_RUN_CONFIG} \
+oe-run-native gem5-aarch64-native ${GEM5_RUN_CONFIG} \
     ${STAGING_DATADIR_NATIVE}/gem5/${GEM5_RUN_PROFILE} ${args} "$@"
 

meta-gem5/recipes-devtools/gem5/gem5-native.inc

@@ -41,14 +41,7 @@ do_install() {
     for f in ${GEM5_BUILD_CONFIGS}; do
         destname=$(basename $f)
         install -d ${D}${bindir}
-        install -m 755 $f ${D}${bindir}/$destname.real
-        cat <<EOF > ${D}${bindir}/$destname
-#!/bin/bash
-basedir=\$(cd \$(dirname \$0)/../../; pwd)
-export LD_LIBRARY_PATH="\$basedir/lib:\$basedir/usr/lib"
-\$basedir/usr/bin/$destname.real "\$@"
-EOF
-        chmod a+x ${D}${bindir}/$destname
+        install -m 755 $f ${D}${bindir}/$destname
     done
 }
 
@@ -56,3 +49,4 @@ FILES_${PN} = "${datadir}/gem5/* ${bindir}/*"
 INSANE_SKIP_${PN} += "already-stripped"
 RDEPENDS_${PN} += "python3-native hdf5-native protobuf-native libpng-native"
 
+addtask addto_recipe_sysroot before do_build