Patchwork sstate: Fix SSTATE_DUPWHITELIST variable usage

login
register
mail settings
Submitter Richard Purdie
Date Sept. 26, 2012, 11:45 a.m.
Message ID <1348659917.8662.97.camel@ted>
Download mbox | patch
Permalink /patch/37263/
State Accepted
Commit 9e31c748327e92b809330f4ad7b6aaecb2edf559
Headers show

Comments

Richard Purdie - Sept. 26, 2012, 11:45 a.m.
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>
---

Patch

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6ccaf6d..0037ce5 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()