[OE-core] [PATCH 2/2] glib-2.0: Fix hardcoded paths in checksums

[Richard Purdie]

The expansion by this function, recently added by the meson site handling code
was causing hardcoded paths to become embedded in the tash hashes. Avoid this
(and hence avoid eSDK failures which exposed this).

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb | 3 ++-
 1 file changed, 2 insertions(+), 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 953fba501a7..5e71c81cca1 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
@@ -29,6 +29,7 @@ def find_meson_cross_files(d):
     if bb.data.inherits_class('native', d):
         return ""
 
+    corebase = d.getVar("COREBASE")
     import collections
     sitedata = siteinfo_data(d)
     # filename -> found
@@ -36,7 +37,7 @@ def find_meson_cross_files(d):
     for path in d.getVar("FILESPATH").split(":"):
         for element in sitedata:
             filename = os.path.join(path, "meson.cross.d", element)
-            files[filename] = os.path.exists(filename)
+            files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename)
 
     items = ["--cross-file=" + k for k,v in files.items() if v]
     d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
-- 
2.20.1