diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-03 12:55:47 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-03 12:55:47 +0000 |
| commit | c303f5ecf7cda1c3b8bb776a6800946c0487cd93 (patch) | |
| tree | 2ac90092c6734322bc9a0892825513d26c902071 | |
| parent | e36ac3ab3a7fe02c7eeb3998ff33c001ab795841 (diff) | |
| download | openembedded-core-c303f5ecf7cda1c3b8bb776a6800946c0487cd93.tar.gz openembedded-core-c303f5ecf7cda1c3b8bb776a6800946c0487cd93.tar.bz2 openembedded-core-c303f5ecf7cda1c3b8bb776a6800946c0487cd93.zip | |
Revert "utils.bbclass: Fix override ordering for FILESPATH"
This reverts commit 0bd63125c3b44a656e44f2a76cc5f832c9db4bbd.
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.
| -rw-r--r-- | meta/classes/utils.bbclass | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 0a533afb1f..d1f6563a0a 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -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) |