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@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 5e71c81cca19f8536d831720d264ab70f37806d1..e4cf50d22f6cb149a9b477cb33bd692feb1aaf6e 100644 (file)
--- 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]