mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 14:09:47 +00:00
Code Issues Projects Releases Wiki Activity

utils.bbclass: skip empty paths when handling FILESEXTRAPATHS

Browse Source 
* 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>
This commit is contained in:
Martin Jansa
2011-08-19 14:16:28 +02:00
committed by Richard Purdie
parent 5c78d94543
commit ec63594a8e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/utils.bbclass
+3 -2
View File
@@ -338,8 +338,9 @@ def base_set_filespath(path, d):
# The ":" ensures we have an 'empty' override # The ":" ensures we have an 'empty' override
overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
for p in path: for p in path:
for o in overrides.split(":"): if p != "":
filespath.append(os.path.join(p, o)) for o in overrides.split(":"):
filespath.append(os.path.join(p, o))
return ":".join(filespath) return ":".join(filespath)
def extend_variants(d, var, extend, delim=':'): def extend_variants(d, var, extend, delim=':'):