From 0770548c90b819a90bdf74f98664966c75bd5326 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Oct 2010 09:24:41 +0000 Subject: 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 Signed-off-by: Denys Dmytriyenko --- conf/bitbake.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf/bitbake.conf') 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. -- cgit 1.2.3-korg