From: Alex Kiernan Date: Sun, 12 Jan 2020 16:39:47 +0000 (+0000) Subject: glib-2.0: Fix hardcoded paths with dots in names X-Git-Tag: uninative-2.8~549 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=05c514bfdd0f3201f6a516c9dc93dff0592e23db;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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 5e71c81cca..e4cf50d22f 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]