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:35 -0700 |
commit | ec63594a8ee803ca367badcd4dc5ff82019e20ac (patch) | |
tree | f69bdd616a7028c54e549fc8d160826b6800fe33 /meta/classes/utils.bbclass | |
parent | 5c78d94543c81f8e53e48ebc616ec729fa872533 (diff) | |
download | poky-ec63594a8ee803ca367badcd4dc5ff82019e20ac.tar.gz |
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 ':'
(From OE-Core rev: 3b5591d423324da076d038ad335af47b616a7903)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/utils.bbclass')
-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 56abdd844c..3c2e342f91 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass | |||
@@ -338,8 +338,9 @@ def base_set_filespath(path, d): | |||
338 | # The ":" ensures we have an 'empty' override | 338 | # The ":" ensures we have an 'empty' override |
339 | overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" | 339 | overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" |
340 | for p in path: | 340 | for p in path: |
341 | for o in overrides.split(":"): | 341 | if p != "": |
342 | filespath.append(os.path.join(p, o)) | 342 | for o in overrides.split(":"): |
343 | filespath.append(os.path.join(p, o)) | ||
343 | return ":".join(filespath) | 344 | return ":".join(filespath) |
344 | 345 | ||
345 | def extend_variants(d, var, extend, delim=':'): | 346 | def extend_variants(d, var, extend, delim=':'): |