[OE-core] [OE-Core][PATCH] glib-2.0: Fix hardcoded paths with dots in names

Alex Kiernan alex.kiernan at gmail.com
Sun Jan 12 16:39:47 UTC 2020

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>

 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 5e71c81cca19..e4cf50d22f6c 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]

More information about the Openembedded-core mailing list