[oe-commits] [openembedded-core] 18/23: glib-2.0: Fix hardcoded paths with dots in names

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 4d0363608bc5b80d841ab6ece87b58c71b959445
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Sun Jan 12 16:39:47 2020 +0000

    glib-2.0: Fix hardcoded paths with dots in names
    
    b4087338be09 ("glib-2.0: Fix hardcoded paths in checksums") fixed
    embedded paths in task hashes, but if these paths included dots then
    these were flattened when COREBASE was computed. Fix this by resolving
    our filenames before replacing the path segments with COREBASE.
    
    Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
index 5e71c81..e4cf50d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
@@ -36,7 +36,7 @@ def find_meson_cross_files(d):
     files = collections.OrderedDict()
     for path in d.getVar("FILESPATH").split(":"):
         for element in sitedata:
-            filename = os.path.join(path, "meson.cross.d", element)
+            filename = os.path.normpath(os.path.join(path, "meson.cross.d", element))
             files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename)
 
     items = ["--cross-file=" + k for k,v in files.items() if v]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.