diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-08-19 14:16:28 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-23 18:23:17 -0700 |
| commit | 3b5591d423324da076d038ad335af47b616a7903 (patch) | |
| tree | 3883340c4db842069d70f034b74930df61968577 | |
| parent | 0934dc7c421ea6fb8f16ce535be72dda9ecb17de (diff) | |
| download | openembedded-core-3b5591d423324da076d038ad335af47b616a7903.tar.gz openembedded-core-3b5591d423324da076d038ad335af47b616a7903.tar.bz2 openembedded-core-3b5591d423324da076d038ad335af47b616a7903.tar.xz openembedded-core-3b5591d423324da076d038ad335af47b616a7903.zip | |
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@gmail.com>
| -rw-r--r-- | 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 56abdd844..3c2e342f9 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=':'): |