utils.bbclass: fix is_machine_specific
PATCH 1/1 utils.bbclass: fix is_machine_specific
* base.bbclass can set a package's PACKAGE_ARCH to MACHINE_ARCH if it finds file:// in the SRC_URI and the corresponding file is machine specific (recipes/foo/foo-1.0/<some machine>/)
* but is_machine_specific actually fails to detect these files as urldata.path is used instead of urldata.localpath thus preventing the comparison of the file's path with machinepaths
* tested with bitbake HEAD & 1.8.18, with OE's tree alone and OE's tree plus an overlay.
--- classes/utils.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
classes/utils.bbclass +1 -1
@@ -54,7 +54,7 @@ def is_machine_specific(d): urldatadict = bb.fetch.init(d.getVar("SRC_URI", True).split(), d, True) for urldata in (urldata for urldata in urldatadict.itervalues() if urldata.type == "file"): - if any(urldata.path.startswith(mp + "/") for mp in machinepaths): + if any(urldata.localpath.startswith(mp + "/") for mp in machinepaths): return True def subprocess_setup():
Signature · 1 line
1.6.3.3
Quoted 11 lines · Eric Bénard
* base.bbclass can set a package's
PACKAGE_ARCHtoMACHINE_ARCHif it finds file:// in theSRC_URIand the corresponding file is machine specific (recipes/foo/foo-1.0/<some machine>/)
* butis_machine_specificactually fails to detect these files as urldata.path is used instead of urldata.localpath thus preventing the comparison of the file's path with machinepaths
* tested with bitbake HEAD & 1.8.18, with OE's tree alone and OE's tree plus an overlay.Signed-off-by Eric Bénard <[email protected]>
Signature · 5 lines
Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics
Quoted 10 lines · Eric Bénard
* base.bbclass can set a package's
PACKAGE_ARCHtoMACHINE_ARCHif it finds file:// in theSRC_URIand the corresponding file is machine specific (recipes/foo/foo-1.0/<some machine>/)
* butis_machine_specificactually fails to detect these files as urldata.path is used instead of urldata.localpath thus preventing the comparison of the file's path with machinepaths
* tested with bitbake HEAD & 1.8.18, with OE's tree alone and OE's tree plus an overlay.Signed-off-by Eric Bénard <[email protected]>
Quoted 26 lines
---
classes/utils.bbclass | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)classes/utils.bbclass +0
-0@@ -54,7 +54,7 @@ def is_machine_specific(d): urldatadict = bb.fetch.init(d.getVar("SRC_URI", True).split(), d, True) for urldata in (urldata for urldata in urldatadict.itervalues()if urldata.type == "file"):
- ifany(urldata.path.startswith(mp + "/") for mp in machinepaths):
+ ifany(urldata.localpath.startswith(mp + "/") for mp in machinepaths):
return Truedef
subprocess_setup():
--
1.6.3.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
-Khem