summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-04-12 23:41:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-13 10:54:10 +0100
commitec9b108f468160e6f5abe215f37f7b32b3c2e305 (patch)
tree1328ccf903b0a26e20d69942dedb98e56362a6e0
parent4393cc550b4b3feaa42b988b819c13518c836f09 (diff)
downloadpoky-ec9b108f468160e6f5abe215f37f7b32b3c2e305.tar.gz
qemuboot: write native sysroot of qemu-helper into qemuboot.conf
Native sysroot of qemu-helper contains all required tools (qemu-system and tunctl atm) for runqemu to work. It's not removed by rm_dir and should always exist. It makes sense to write it into qemuboot.conf to make runqemu to use it as a default directory for native tools. This should also speed up runqemu as it doesn't need to run to run 'bitbake qemu-helper -e' to get its native sysroot. [YOCTO #11266] [YOCTO #11193] (From OE-Core rev: 0f207bfc1f7a4fd509b78d32bbe1a8d4ebea8053) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/qemuboot.bbclass9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 2870388dfb..cc5314e4ae 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -87,7 +87,14 @@ python do_write_qemuboot_conf() {
87 cf = configparser.ConfigParser() 87 cf = configparser.ConfigParser()
88 cf.add_section('config_bsp') 88 cf.add_section('config_bsp')
89 for k in qemuboot_vars(d): 89 for k in qemuboot_vars(d):
90 cf.set('config_bsp', k, '%s' % d.getVar(k)) 90 # qemu-helper-native sysroot is not removed by rm_work and
91 # contains all tools required by runqemu
92 if k == 'STAGING_BINDIR_NATIVE':
93 val = os.path.join(d.getVar('BASE_WORKDIR'), d.getVar('BUILD_SYS'),
94 'qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/')
95 else:
96 val = d.getVar(k)
97 cf.set('config_bsp', k, '%s' % val)
91 98
92 # QB_DEFAULT_KERNEL's value of KERNEL_IMAGETYPE is the name of a symlink 99 # QB_DEFAULT_KERNEL's value of KERNEL_IMAGETYPE is the name of a symlink
93 # to the kernel file, which hinders relocatability of the qb conf. 100 # to the kernel file, which hinders relocatability of the qb conf.