]> code.ossystems Code Review - openembedded-core.git/commitdiff
devtool: point runqemu to correct native bindir
authorbrian avery <brian.avery@intel.com>
Tue, 4 Apr 2017 23:23:24 +0000 (16:23 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 5 Apr 2017 08:40:55 +0000 (09:40 +0100)
devtool/runqemu.py was relying on STAGING_BINDIR_NATIVE to find the host
tools it needed like qemu-system-<arch>.  In the post RSS world, this no
longer exists. This patch points it to
{STAGING_DIR}/{BUILD_ARCH}/{bindir_native}.

[YOCTO #11223]

Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/devtool/runqemu.py

index 641664e565defb15f787532a3aaf1691b2ed6649..e26cf28c2f251a578e6ddfe9a3f963cd6afdcaf5 100644 (file)
@@ -32,7 +32,9 @@ def runqemu(args, config, basepath, workspace):
     tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
     try:
         machine = tinfoil.config_data.getVar('MACHINE')
-        bindir_native = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE')
+        bindir_native = os.path.join(tinfoil.config_data.getVar('STAGING_DIR'),
+                                     tinfoil.config_data.getVar('BUILD_ARCH'),
+                                     tinfoil.config_data.getVar('bindir_native').lstrip(os.path.sep))
     finally:
         tinfoil.shutdown()