From ec63594a8ee803ca367badcd4dc5ff82019e20ac Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 19 Aug 2011 14:16:28 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/utils.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/classes/utils.bbclass') 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): # 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=':'): -- cgit v1.2.3-54-g00ecf