Skip to contentSkip to conversation

esdk: Fixes for runqemu and sysroot

PATCH New brian avery 1 participant 2 messages Apr 4, 2017

lore
Share & tools
lore
#0 lore raw

cover esdk: Fixes for runqemu and sysroot

The removal of STAGING_BINDIR_NATIVE broke runqemu in the esdk. This patch points the "devtool runqemu" into the correct native bindir where the necessary tools are located.

This fixes Bug 11223.

-brian

The following changes since commit eff56e4f0d59b1d965a68e4f009b7f07717b7edd:

bitbake: bitbake-user-manual: Fixed special character in -D output (2017-04-03 22:32:02 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib bavery/esdk_sadqemu/bug11223
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/esdk_sadqemu/bug11223

brian avery (1):
devtool: point runqemu to correct native bindir

 scripts/lib/devtool/runqemu.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--
1.9.1

#1 lore raw

PATCH 1/1 devtool: point runqemu to correct native bindir

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]

---
 scripts/lib/devtool/runqemu.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
scripts/lib/devtool/runqemu.py +3 -1
index 641664e..e26cf28 100644
@@ -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()
 
Signature · 1 line
1.9.1