runqemu: use OECORE_NATIVE_SYSROOT from sdk
There is no STAGING_DIR_NATIVE or bitbake in a extracted sdk, so check OECORE_NATIVE_SYSROOT and use it. (From OE-Core rev: 93649edc034f2540ff55dc9b41638797209cfb9c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5060e66c75
commit
5637f8605f
|
@ -619,18 +619,25 @@ class BaseConfig(object):
|
||||||
self.set(nv, s.group(1))
|
self.set(nv, s.group(1))
|
||||||
else:
|
else:
|
||||||
# when we're invoked from a running bitbake instance we won't
|
# when we're invoked from a running bitbake instance we won't
|
||||||
# be able to call `bitbake -e` but should have OE_TMPDIR set in
|
# be able to call `bitbake -e`, then try:
|
||||||
# the environment and can guess paths based on it
|
# - get OE_TMPDIR from environment and guess paths based on it
|
||||||
|
# - get OECORE_NATIVE_SYSROOT from environment (for sdk)
|
||||||
tmpdir = os.environ.get('OE_TMPDIR', None)
|
tmpdir = os.environ.get('OE_TMPDIR', None)
|
||||||
|
oecore_native_sysroot = os.environ.get('OECORE_NATIVE_SYSROOT', None)
|
||||||
if tmpdir:
|
if tmpdir:
|
||||||
logger.info('Setting STAGING_DIR_NATIVE and STAGING_BINDIR_NATIVE relative to OE_TMPDIR (%s)' % tmpdir)
|
logger.info('Setting STAGING_DIR_NATIVE and STAGING_BINDIR_NATIVE relative to OE_TMPDIR (%s)' % tmpdir)
|
||||||
hostos, _, _, _, machine = os.uname()
|
hostos, _, _, _, machine = os.uname()
|
||||||
buildsys = '%s-%s' % (machine, hostos.lower())
|
buildsys = '%s-%s' % (machine, hostos.lower())
|
||||||
staging_dir_native = '%s/sysroots/%s' % (tmpdir, buildsys)
|
staging_dir_native = '%s/sysroots/%s' % (tmpdir, buildsys)
|
||||||
self.set('STAGING_DIR_NATIVE', staging_dir_native)
|
self.set('STAGING_DIR_NATIVE', staging_dir_native)
|
||||||
|
elif oecore_native_sysroot:
|
||||||
|
logger.info('Setting STAGING_DIR_NATIVE to OECORE_NATIVE_SYSROOT (%s)' % oecore_native_sysroot)
|
||||||
|
self.set('STAGING_DIR_NATIVE', oecore_native_sysroot)
|
||||||
|
if self.get('STAGING_DIR_NATIVE'):
|
||||||
# we have to assume that STAGING_BINDIR_NATIVE is at usr/bin
|
# we have to assume that STAGING_BINDIR_NATIVE is at usr/bin
|
||||||
staging_bindir_native = '%s/usr/bin' % staging_dir_native
|
staging_bindir_native = '%s/usr/bin' % self.get('STAGING_DIR_NATIVE')
|
||||||
self.set('STAGING_BINDIR_NATIVE', staging_bindir_native)
|
logger.info('Setting STAGING_BINDIR_NATIVE to %s' % staging_bindir_native)
|
||||||
|
self.set('STAGING_BINDIR_NATIVE', '%s/usr/bin' % self.get('STAGING_DIR_NATIVE'))
|
||||||
|
|
||||||
def print_config(self):
|
def print_config(self):
|
||||||
logger.info('Continuing with the following parameters:\n')
|
logger.info('Continuing with the following parameters:\n')
|
||||||
|
|
Loading…
Reference in New Issue