[oe-commits] Richard Purdie : sstate: Fix SSTATE_DUPWHITELIST variable usage
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 26 13:53:42 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 9e31c748327e92b809330f4ad7b6aaecb2edf559
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9e31c748327e92b809330f4ad7b6aaecb2edf559
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Wed Sep 26 12:45:17 2012 +0100
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 at linuxfoundation.org>
---
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 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()
More information about the Openembedded-commits
mailing list