diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2010-10-16 09:24:41 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2010-10-22 15:31:44 -0400 |
commit | 0770548c90b819a90bdf74f98664966c75bd5326 (patch) | |
tree | 463c3cc4350a4a2f85891acb347ca5238e2cdf7c /conf | |
parent | c0155f9063b0edecd77ab7e10f483cf82b6dc384 (diff) | |
download | openembedded-0770548c90b819a90bdf74f98664966c75bd5326.tar.gz |
bitbake.conf: don't append MACHINE_OVERRIDES to OVERRIDES when it's empty
* empty MACHINE_OVERRIDES adds :: to OVERRIDES (then in FILESPATH skips
every directory after this)
* strip() is needed to remove space in case some distribution has ie
MACHINE_OVERRIDES ?= ""
and then
MACHINE_OVERRIDES += ""
or
MACHINE_OVERRIDES ?= "${MACHINE_CLASS}", where MACHINE_CLASS is empty again
While FILESPATH was fixed separately, having :: in OVERRIDES still makes
bitbake 1.8.18 to throw a "RuntimeError: Set changed size during iteration"
exception when used together with collections.inc, since bitbake is being
re-spawned in there. More details here:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/38254/focus=38595
Acked-by: Chase Maupin <chase.maupin@ti.com>
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/bitbake.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 923cf19871..539ab3db38 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -677,8 +677,9 @@ BUILDCFG_NEEDEDVARS ?= "TARGET_ARCH TARGET_OS" # Overrides are processed left to right, so the ones that are named later take precedence. # You generally want them to go from least to most specific. MACHINE_OVERRIDES ?= "" -OVERRIDES = "pn-${PN}:fail-fast:build-${BUILD_OS}:${TARGET_ARCH}:${TARGET_OS}:\ -${DISTRO}:${@':'.join(d.getVar('MACHINE_OVERRIDES', True).split())}:${MACHINE}:local" +OVERRIDES = "pn-${PN}:fail-fast:build-${BUILD_OS}:${TARGET_ARCH}:${TARGET_OS}:${DISTRO}:\ +${@[':'.join(d.getVar('MACHINE_OVERRIDES', True).split())+':',''][d.getVar('MACHINE_OVERRIDES', True).strip() == '']}\ +${MACHINE}:local" ################################################################## # Include the rest of the config files. |