diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2017-06-29 14:48:24 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 08:44:25 +0100 |
commit | c8330a053be17e42954d1ede9e3fd42b9b8a530f (patch) | |
tree | aa4c87250d49852b10eeadc6f35ee564af3c85c9 /meta/lib/oe/copy_buildsystem.py | |
parent | ad734fd64add0f44a4e5125823cc15ee0ae30aa0 (diff) | |
download | poky-c8330a053be17e42954d1ede9e3fd42b9b8a530f.tar.gz |
oe/copy_buildsystem: check_sstate_task_list also pop BBPATH from env
The BBPATH environment could be set and can make a failure when try
to build an extensible sdk because it will look the bitbake.lock
file in the original build folder.
Example:
$ export BBPATH=`pwd`
$ bitbake core-image-minimal -c populate_sdk_ext
ERROR: bitbake failed:
ERROR: Only one copy of bitbake should be run against a build directory
ERROR: core-image-minimal-1.0-r0 do_populate_sdk_ext: Function failed:
copy_buildsystem
(From OE-Core rev: 33634b4c38d84e1c5d06056766933f1fe4f47e8d)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/copy_buildsystem.py')
-rw-r--r-- | meta/lib/oe/copy_buildsystem.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index a372904183..dd506a39e6 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py | |||
@@ -239,6 +239,7 @@ def check_sstate_task_list(d, targets, filteroutfile, cmdprefix='', cwd=None, lo | |||
239 | cmd = "%sBB_SETSCENE_ENFORCE=1 PSEUDO_DISABLED=1 oe-check-sstate %s -s -o %s %s" % (cmdprefix, targets, filteroutfile, logparam) | 239 | cmd = "%sBB_SETSCENE_ENFORCE=1 PSEUDO_DISABLED=1 oe-check-sstate %s -s -o %s %s" % (cmdprefix, targets, filteroutfile, logparam) |
240 | env = dict(d.getVar('BB_ORIGENV', False)) | 240 | env = dict(d.getVar('BB_ORIGENV', False)) |
241 | env.pop('BUILDDIR', '') | 241 | env.pop('BUILDDIR', '') |
242 | env.pop('BBPATH', '') | ||
242 | pathitems = env['PATH'].split(':') | 243 | pathitems = env['PATH'].split(':') |
243 | env['PATH'] = ':'.join([item for item in pathitems if not item.endswith('/bitbake/bin')]) | 244 | env['PATH'] = ':'.join([item for item in pathitems if not item.endswith('/bitbake/bin')]) |
244 | bb.process.run(cmd, stderr=subprocess.STDOUT, env=env, cwd=cwd, executable='/bin/bash') | 245 | bb.process.run(cmd, stderr=subprocess.STDOUT, env=env, cwd=cwd, executable='/bin/bash') |