[oe] [PATCH] bitbake.conf: don't append MACHINE_OVERRIDES to OVERRIDES when it's empty
Martin Jansa
martin.jansa at gmail.com
Sat Oct 16 19:24:41 UTC 2010
* 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
---
conf/bitbake.conf | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 155c593..5c45e1e 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -676,8 +676,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.
--
1.7.3.1
More information about the Openembedded-devel
mailing list