From f5e2dafcb882ae4a08c64dbedd9fae41dcb2b317 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 11 Sep 2016 19:13:20 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/classes/sstate.bbclass') 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): f = os.path.normpath(f) realmatch = True for w in whitelist: + w = os.path.normpath(w) if f.startswith(w): realmatch = False break -- cgit v1.2.3-54-g00ecf