diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2016-09-11 19:13:20 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-14 22:20:03 +0100 |
| commit | d82acf20541463b14a811788d28fb1db3539885b (patch) | |
| tree | 0767e04992fa6fdade7328b0a80827afd6ab2d47 /meta/classes | |
| parent | 58d6cd369a3316a6ba313a2f1982bde5d47c0608 (diff) | |
| download | openembedded-core-d82acf20541463b14a811788d28fb1db3539885b.tar.gz openembedded-core-d82acf20541463b14a811788d28fb1db3539885b.tar.bz2 openembedded-core-d82acf20541463b14a811788d28fb1db3539885b.zip | |
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'
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | 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 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 |