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:
parent
7008903065
commit
2238d4a63f
|
@ -307,11 +307,10 @@ def base_set_filespath(path, d):
|
||||||
if extrapaths != "":
|
if extrapaths != "":
|
||||||
path = extrapaths.split(":") + path
|
path = extrapaths.split(":") + path
|
||||||
# The ":" ensures we have an 'empty' override
|
# The ":" ensures we have an 'empty' override
|
||||||
overrides = (":" + (d.getVar("FILESOVERRIDES", True) or "")).split(":")
|
overrides = ((d.getVar("FILESOVERRIDES", True) or "") + ":").split(":")
|
||||||
overrides.reverse()
|
for p in path:
|
||||||
for o in overrides:
|
if p != "":
|
||||||
for p in path:
|
for o in overrides:
|
||||||
if p != "":
|
|
||||||
filespath.append(os.path.join(p, o))
|
filespath.append(os.path.join(p, o))
|
||||||
return ":".join(filespath)
|
return ":".join(filespath)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue