summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 12:45:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 14:40:46 +0100
commit9e31c748327e92b809330f4ad7b6aaecb2edf559 (patch)
tree7b9e5a683ad3a00519670ad0a7532881206f3926
parent372dc3cf95373225d512160a2ec3e16bf3dc5b8f (diff)
downloadopenembedded-core-9e31c748327e92b809330f4ad7b6aaecb2edf559.tar.gz
openembedded-core-9e31c748327e92b809330f4ad7b6aaecb2edf559.tar.bz2
openembedded-core-9e31c748327e92b809330f4ad7b6aaecb2edf559.zip
sstate: Fix SSTATE_DUPWHITELIST variable usage
We need to split this variable before using it. Otherwise a single "/" character in the list whitelists every overlapping sysroot file which was not the intention making the whole thing useless. We'll start seeing warnings about overlapping files now this is working correctly after this patch. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6ccaf6d682..0037ce5638 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -144,7 +144,7 @@ def sstate_install(ss, d):
# Check the file list for conflicts against the master manifest
mastermanifest = d.getVar("SSTATE_MASTERMANIFEST", True)
- whitelist = d.getVar("SSTATE_DUPWHITELIST", True)
+ whitelist = (d.getVar("SSTATE_DUPWHITELIST", True) or "").split()
lock = bb.utils.lockfile(mastermanifest + ".lock")
if not os.path.exists(mastermanifest):
open(mastermanifest, "w").close()