diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-26 12:45:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-26 15:02:25 +0100 |
commit | 8593c6c1d8995f449a41a99c6e3242e2e58e79a5 (patch) | |
tree | 4144e930c10e3a60f383bc19d073908f7f9bef21 /meta/classes | |
parent | acd52fd17da9cdad406d052ce397091c23588b7a (diff) | |
download | poky-8593c6c1d8995f449a41a99c6e3242e2e58e79a5.tar.gz |
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.
(From OE-Core rev: 9e31c748327e92b809330f4ad7b6aaecb2edf559)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sstate.bbclass | 2 |
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): | |||
144 | 144 | ||
145 | # Check the file list for conflicts against the master manifest | 145 | # Check the file list for conflicts against the master manifest |
146 | mastermanifest = d.getVar("SSTATE_MASTERMANIFEST", True) | 146 | mastermanifest = d.getVar("SSTATE_MASTERMANIFEST", True) |
147 | whitelist = d.getVar("SSTATE_DUPWHITELIST", True) | 147 | whitelist = (d.getVar("SSTATE_DUPWHITELIST", True) or "").split() |
148 | lock = bb.utils.lockfile(mastermanifest + ".lock") | 148 | lock = bb.utils.lockfile(mastermanifest + ".lock") |
149 | if not os.path.exists(mastermanifest): | 149 | if not os.path.exists(mastermanifest): |
150 | open(mastermanifest, "w").close() | 150 | open(mastermanifest, "w").close() |