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

utils.bbclass: Fix override ordering for FILESPATH 

Currently the overrides are being applied backwards. This means something which is
platform specific is overriding something which is machine specific which
is clearly not intended.

This patch corrects the ordering to match the normal expected behaviour of
OVERRIDES.

Secondly, all overrides are being searched for each path in turn. What should
really happen is that we should look for the highest priority override (e.g. distro
or machine) in each layer, then move on to platform/tune (e.g. armv7a) and
then to arch (e.g. arm). This patch therefore also reverses the for loops
to achieve this behaviour and give the result the user would expect.

(From OE-Core rev: 92cbf7eeea553bfa24c7081473fa8bc4ebc1f552)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-10-07 11:20:07 +00:00
parent 5e3ed0b3a6
commit 0bd63125c3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/utils.bbclass
View File

@ -307,10 +307,11 @@ 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(":")
for p in path:
if p != "":
for o in overrides:
overrides = (":" + (d.getVar("FILESOVERRIDES", True) or "")).split(":")
overrides.reverse()
for o in overrides:
for p in path:
if p != "":
filespath.append(os.path.join(p, o))
return ":".join(filespath)