[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2440/8267] sstate.bbclass: normalize whitelisted paths
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 2440/8267] sstate.bbclass: normalize whitelisted paths
- Date: Sat, 16 Dec 2017 23:14:00 +0000 (UTC)
commit f5e2dafcb882ae4a08c64dbedd9fae41dcb2b317
Author: Max Krummenacher <max oss 09 gmail com>
Date: Sun Sep 11 19:13:20 2016 +0200
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>
meta/classes/sstate.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 8b6ac50..216e133 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]