[oe-commits] [openembedded-core] 02/04: glib-2.0: Fix hardcoded paths in checksums

[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 0b6761065f10a1fec30f35e8339c168f96c98c12
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Jan 10 17:56:16 2020 +0000

    glib-2.0: Fix hardcoded paths in checksums
    
    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 953fba5..5e71c81 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))

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