summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 12:55:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 17:51:31 +0000
commit2238d4a63f55721aad4557f862bd6c86a3e2c904 (patch)
treea2a807f4c05e8f5b7e40469d6afe9e7bb62a1a15
parent7008903065d13373faf8d1f6d1c1c878930db5a3 (diff)
downloadpoky-2238d4a63f55721aad4557f862bd6c86a3e2c904.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/utils.bbclass9
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):
307 if extrapaths != "": 307 if extrapaths != "":
308 path = extrapaths.split(":") + path 308 path = extrapaths.split(":") + path
309 # The ":" ensures we have an 'empty' override 309 # The ":" ensures we have an 'empty' override
310 overrides = (":" + (d.getVar("FILESOVERRIDES", True) or "")).split(":") 310 overrides = ((d.getVar("FILESOVERRIDES", True) or "") + ":").split(":")
311 overrides.reverse() 311 for p in path:
312 for o in overrides: 312 if p != "":
313 for p in path: 313 for o in overrides:
314 if p != "":
315 filespath.append(os.path.join(p, o)) 314 filespath.append(os.path.join(p, o))
316 return ":".join(filespath) 315 return ":".join(filespath)
317 316