sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Revert "utils.bbclass: Fix override ordering for FILESPATH" 

This reverts commit 0bd63125c3.

As discussed on the mailing list, this change changes layer layout
in a stable branch which is unaccetable. The was accidentally
backported and should not have been, this reverts it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-12-03 12:55:47 +00:00
parent 7008903065
commit 2238d4a63f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/utils.bbclass
View File

@ -307,11 +307,10 @@ def base_set_filespath(path, d):
if extrapaths != "":
path = extrapaths.split(":") + path
# The ":" ensures we have an 'empty' override
overrides = (":" + (d.getVar("FILESOVERRIDES", True) or "")).split(":")
overrides.reverse()
for o in overrides:
for p in path:
if p != "":
overrides = ((d.getVar("FILESOVERRIDES", True) or "") + ":").split(":")
for p in path:
if p != "":
for o in overrides:
filespath.append(os.path.join(p, o))
return ":".join(filespath)