summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2016-09-11 19:13:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:11 +0100
commitf5e2dafcb882ae4a08c64dbedd9fae41dcb2b317 (patch)
tree0620bb253686991a6239f0505e8e4454be6ce6b3 /meta
parentd115b1277fc76bc04583f751ae8146b97e0a0f30 (diff)
downloadpoky-f5e2dafcb882ae4a08c64dbedd9fae41dcb2b317.tar.gz
sstate.bbclass: normalize whitelisted paths
Without this a whitelisted path containing /../ breaks the test for a file allowed to be provided by more than one recipe. Noticed when local.conf contains: DEPLOY_DIR = "${TOPDIR}/../deploy" |ERROR: core-image-minimal-1.0-r0 do_image_complete: The recipe | core-image-minimal is trying to install files into a shared area when those | files already exist. Those files and their manifest location are: | .../poky/deploy/images/qemux86/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | Matched in b'manifest-qemux86-linux-yocto.deploy' (From OE-Core rev: d82acf20541463b14a811788d28fb1db3539885b) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 8b6ac50cc9..216e133279 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -205,6 +205,7 @@ def sstate_install(ss, d):
205 f = os.path.normpath(f) 205 f = os.path.normpath(f)
206 realmatch = True 206 realmatch = True
207 for w in whitelist: 207 for w in whitelist:
208 w = os.path.normpath(w)
208 if f.startswith(w): 209 if f.startswith(w):
209 realmatch = False 210 realmatch = False
210 break 211 break