[oe-commits] Martin Jansa : utils.bbclass: skip empty paths when handling FILESEXTRAPATHS
git version control
git at git.openembedded.org
Wed Aug 24 01:25:27 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 3b5591d423324da076d038ad335af47b616a7903
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3b5591d423324da076d038ad335af47b616a7903
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Fri Aug 19 14:16:28 2011 +0200
utils.bbclass: skip empty paths when handling FILESEXTRAPATHS
* if there is multiple .bbappend files with FILESEXTRAPATHS_prepend := "/:"
then the one parsed last is causing trailing ':' and that's causing empty element in
path = extrapaths.split(:) + path
* it's hard to keep all .bbappends from foreign layers to follow this rule, so it's better
to be able to handle trailing ':'
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta/classes/utils.bbclass | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 56abdd8..3c2e342 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -338,8 +338,9 @@ def base_set_filespath(path, d):
# The ":" ensures we have an 'empty' override
overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
for p in path:
- for o in overrides.split(":"):
- filespath.append(os.path.join(p, o))
+ if p != "":
+ for o in overrides.split(":"):
+ filespath.append(os.path.join(p, o))
return ":".join(filespath)
def extend_variants(d, var, extend, delim=':'):
More information about the Openembedded-commits
mailing list