glib-2.0: replace THISDIR instead of COREBASE in find_meson_cross_files --cross-file paths
PATCH 1/1 glib-2.0: replace THISDIR instead of COREBASE in find_meson_cross_files --cross-file paths
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +6 -2
@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found
@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + 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)) + continue + files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) items = ["--cross-file=" + k for k,v in files.items() if v] d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
Signature · 1 line
2.27.0
This breaks our builds,
...
ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path
...
In,
Regards,
Anibal
Quoted 54 lines · Martin Jansa
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +4
-2@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, because it'snot relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir))
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +2
-0+ continue + files[filename.replace(thisdir, "${THISDIR}")] =
os.path.exists(filename)items = ["--cross-file=" + k for k,v in
files.items()if v]d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
--
2.27.0
what's the value of COREBASE in that build? Wasn't full path already in your sstate signatures - in that case this change didn't break your builds, just highlighted an issue in your builds which was already there.
We can fix that by calling os.path.normpath on THISDIR, but I would like to know the reason why THISDIR is set this way for you (also to reproduce it locally to verify the fix).
Quoted 74 lines · Anibal Limon
This breaks our builds,
...
ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path
...In,
Regards,
AnibalQuoted 54 lines · Martin Jansa
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +4
-2@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, because it'snot relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir))
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +2
-0+ continue + files[filename.replace(thisdir, "${THISDIR}")] =
os.path.exists(filename)items = ["--cross-file=" + k for k,v in
files.items()if v]d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
--
2.27.0
In my directory layout, COREBASE is the poky directory. The layers are under the poky dir also. The TOPDIR is poky/build-${MACHINE}
Quoted 5 lines · Martin Jansa
what's the value of COREBASE in that build? Wasn't full path already in your sstate signatures - in that case this change didn't break your builds, just highlighted an issue in your builds which was already there.
Our COREBASE is,
COREBASE="/home/builds/oe-rpb-master/layers/openembedded-core"
Expands as follows,
...
# $COREBASE [3 operations]
# set/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/conf/layer.conf:20
# "${@os.path.normpath("${LAYERDIR}/../")}"
# set data_smart.py:931 [expandVarref]
# "${@os.path.normpath("/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/../")}"
# set/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/conf/documentation.conf:124
# [doc] "Specifies the parent directory of the OpenEmbedded Core
Metadata layer (i.e. meta)."
# pre-expansion value:
#
"${@os.path.normpath("/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/../")}"
COREBASE="/home/builds/oe-rpb-master/layers/openembedded-core"
...Quoted 4 lines
We can fix that by calling os.path.normpath on THISDIR, but I would like to know the reason why THISDIR is set this way for you (also to reproduce it locally to verify the fix).
I tried it and fixes the issue,
- thisdir = d.getVar("THISDIR")
+ thisdir = os.path.normpath(d.getVar("THISDIR"))
We use the next config files for bblayers and local.conf,
https://github.com/96boards/oe-rpb-manifest/tree/qcom/master/conf
Regards,
Anibal
Quoted 81 lines
Quoted 75 lines · Anibal Limon
This breaks our builds,
...
ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path
...In,
Regards,
AnibalQuoted 54 lines · Martin Jansa
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +4
-2@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, because it'snot relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir))
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +2
-0+ continue + files[filename.replace(thisdir, "${THISDIR}")] =
os.path.exists(filename)items = ["--cross-file=" + k for k,v in
files.items()if v]d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
--
2.27.0
Hi Martin,
The normpath change worked for me also:
- thisdir = d.getVar("THISDIR")
+ thisdir = os.path.normpath(d.getVar("THISDIR"))
Another work-around was to replace the relative paths in our bblayers.conf file which looked like:
${TOPDIR}/../meta-openembedded/meta-oe \
...With
YOCTOROOT = "${@os.path.abspath(os.path.join(d.getVar('TOPDIR'),
os.pardir))}"
${YOCTOROOT}/meta-poky \
...So it looks like the root cause is related to having our layers and build dir under the poky directory and relative paths in the bblayers.conf file (this should be supported, no?).
I plan to change that at some point, but this layout evolved from previous generations of this project.
Quoted 135 lines · Anibal Limon
Quoted 5 lines · Martin Jansa
what's the value of COREBASE in that build? Wasn't full path already in your sstate signatures - in that case this change didn't break your builds, just highlighted an issue in your builds which was already there.
Our COREBASE is,
COREBASE="/home/builds/oe-rpb-master/layers/openembedded-core"
Expands as follows,
...
# $COREBASE [3 operations]
# set/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/conf/layer.conf:20
# "${@os.path.normpath("${LAYERDIR}/../")}"
# set data_smart.py:931 [expandVarref]
# "${@os.path.normpath("/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/../")}"
# set/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/conf/documentation.conf:124
# [doc] "Specifies the parent directory of the OpenEmbedded Core
Metadata layer (i.e. meta)."# pre-expansion value: # "${@os.path.normpath("/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/../")}" COREBASE="/home/builds/oe-rpb-master/layers/openembedded-core" ...Quoted 4 lines
We can fix that by calling os.path.normpath on THISDIR, but I would like to know the reason why THISDIR is set this way for you (also to reproduce it locally to verify the fix).
I tried it and fixes the issue,
(quoted diff) +1
-1- thisdir = d.getVar("THISDIR") + thisdir = os.path.normpath(d.getVar("THISDIR"))We use the next config files for bblayers and local.conf,
https://github.com/96boards/oe-rpb-manifest/tree/qcom/master/conf
Regards,
AnibalQuoted 81 lines
Quoted 75 lines · Anibal Limon
This breaks our builds,
...
ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path
...In,
Regards,
AnibalQuoted 54 lines · Martin Jansa
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +4
-2@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, becauseit's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir))
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +2
-0+ continue + files[filename.replace(thisdir, "${THISDIR}")] =
os.path.exists(filename)items = ["--cross-file=" + k for k,v in
files.items()if v]d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
--
2.27.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
I guess this relative path comes from OEROOT setting in:
https://github.com/96boards/oe-rpb-manifest/blob/master/conf/bblayers.conf#L4
maybe you can call os.path.normpath there as COREBASE is doing in:
meta/conf/layer.conf:COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
That should help with both sstate reuse as well as this error.
Quoted 92 lines · Martin Jansa via lists.openembedded.org
what's the value of COREBASE in that build? Wasn't full path already in your sstate signatures - in that case this change didn't break your builds, just highlighted an issue in your builds which was already there.
We can fix that by calling os.path.normpath on THISDIR, but I would like to know the reason why THISDIR is set this way for you (also to reproduce it locally to verify the fix).
Quoted 75 lines · Anibal Limon
This breaks our builds,
...
ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path
...In,
Regards,
AnibalQuoted 54 lines · Martin Jansa
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +4
-2@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, because it'snot relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir))
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +2
-0+ continue + files[filename.replace(thisdir, "${THISDIR}")] =
os.path.exists(filename)items = ["--cross-file=" + k for k,v in
files.items()if v]d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
--
2.27.0
Same here. Our build artifacts get created but, I get a few thousand of these errors:
ERROR: Cannot add '/home/geoff/yocto-tegra/poky/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/arm-64' to --cross-file, because it's not relative to THISDIR '/ home/geoff/yocto-tegra/poky/build-ccu3/../meta/recipes-core/glib-2.0' and sstate signature would contain this full path
Since the bitbake return code is 1 our CI pipeline does not deploy the
build artifacts.
Would bb.warn() be more appropriate to use for this change than bb.error()?
Quoted 77 lines · Anibal Limon
This breaks our builds,
...
ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path
...In,
Regards,
AnibalQuoted 54 lines · Martin Jansa
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +4
-2@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, because it'snot relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir))
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +2
-0+ continue + files[filename.replace(thisdir, "${THISDIR}")] =
os.path.exists(filename)items = ["--cross-file=" + k for k,v in
files.items()if v]d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
--
2.27.0
Geoff,
the same question for you, what's the value of COREBASE in your build and what's the value of --cross-file in your glib-2.0 do_configure sstate signature?
If both of these are valid issues in sstate signatures then fixing your build configuration is IMHO better than ignoring a warning from bb.warn(). Or at least for this specific case we would need to find some more robust solution than this string replace.
Quoted 95 lines · Geoff Parker
Same here. Our build artifacts get created but, I get a few thousand of these errors:
ERROR: Cannot add '
/home/geoff/yocto-tegra/poky/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/arm-64' to --cross-file, because it's not relative to THISDIR '/ home/geoff/yocto-tegra/poky/build-ccu3/../meta/recipes-core/glib-2.0' and sstate signature would contain this full pathSince the bitbake return code is 1 our CI pipeline does not deploy the
build artifacts.Would
bb.warn()be more appropriate to use for this change thanbb.error()?Quoted 78 lines · Anibal Limon
This breaks our builds,
...
ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path
...In,
Regards,
AnibalQuoted 54 lines · Martin Jansa
* COREBASE works correctly only as long as this recipe is inside of COREBASE directory and leaves the full absolute paths if you copy this recipe into your own layer (e.g. to backport newer version)
* use THISDIR as all FILESPATH should be relative to that, unless there is a .bbappend not only extending FILESPATH, but also adding meson.cross.d files there (at which point it also didn't work with COREBASE replacements as well already) - show an ERROR in such case, I don't think it's common scenario to spend more time to support that.
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +4
-2@@ -31,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found@@ -39,7 +39,11 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, because it'snot relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir))
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +2
-0+ continue + files[filename.replace(thisdir, "${THISDIR}")] =
os.path.exists(filename)items = ["--cross-file=" + k for k,v in
files.items()if v]d.appendVar("EXTRA_OEMESON", " " + " ".join(items))
--
2.27.0