diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-03-05 22:04:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-06 22:39:03 +0000 |
commit | 9852a5caf52fd8bb833bee05a47cfe111ed5b662 (patch) | |
tree | 9972a8291bb0778b49df41a66b396b970917542e /meta/recipes-core | |
parent | 57077fa9313907719dba714a9a13bbda3086ec1b (diff) | |
download | poky-9852a5caf52fd8bb833bee05a47cfe111ed5b662.tar.gz |
glib-2.0: show an error about --cross-file only when such file exists
(From OE-Core rev: 6bd44129a76bdae1320f76035b23568a9c2b4e57)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb index a2fa5345b4..4176dbd207 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | |||
@@ -41,7 +41,8 @@ def find_meson_cross_files(d): | |||
41 | filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) | 41 | filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) |
42 | sanitized_path = filename.replace(thisdir, "${THISDIR}") | 42 | sanitized_path = filename.replace(thisdir, "${THISDIR}") |
43 | if sanitized_path == filename: | 43 | if sanitized_path == filename: |
44 | bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) | 44 | if os.path.exists(filename): |
45 | bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) | ||
45 | continue | 46 | continue |
46 | files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) | 47 | files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) |
47 | 48 | ||