[OE-core] [oe-core][PATCH v2] waf.bbclass: cd to ${S} before checking version
Robert Yang
liezhi.yang at windriver.com
Sun Feb 11 08:35:20 UTC 2018
Hi Joshua,
This one causes the following 2 recipes failed to build:
meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb:do_configure
meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb:do_configure
The error messages are similar:
File: '/usr/lib/python3.4/subprocess.py', lineno: 1457, function: _execute_child
1453: # The error must be from chdir(cwd).
1454: err_msg += ': ' + repr(cwd)
1455: else:
1456: err_msg += ': ' + repr(orig_executable)
*** 1457: raise child_exception_type(errno_num, err_msg)
1458: raise child_exception_type(err_msg)
1459:
1460:
1461: def _handle_exitstatus(self, sts, _WIFSIGNALED=os.WIFSIGNALED,
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/path/to/tmp-glibc/work/i586-wrs-linux/libtdb/1.3.15-r0/tdb-1.3.15/waf'
// Robert
On 02/01/2018 03:49 AM, Joshua Watt wrote:
> waf requires that the current working directory be the project root (in
> this case ${S} when it is invoked. The check to get the waf version was
> being executed as a prefunc for do_configure, which meant it was
> executed before the current working directory was switched to ${S}, and
> thus would fail with some recipes. Fix this by changing to ${S} before
> executing "waf --version"
>
> Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
> ---
> meta/classes/waf.bbclass | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
> index c3e744e5dec..bdbdc56767c 100644
> --- a/meta/classes/waf.bbclass
> +++ b/meta/classes/waf.bbclass
> @@ -26,16 +26,17 @@ def get_waf_parallel_make(d):
> return ""
>
> python waf_preconfigure() {
> + import subprocess
> from distutils.version import StrictVersion
> - srcsubdir = d.getVar('S')
> - wafbin = os.path.join(srcsubdir, 'waf')
> - status, result = oe.utils.getstatusoutput(wafbin + " --version")
> - if status != 0:
> - bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % status)
> - return
> - version = result.split()[1]
> - if StrictVersion(version) >= StrictVersion("1.8.7"):
> - d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
> + subsrcdir = d.getVar('S')
> + wafbin = os.path.join(subsrcdir, 'waf')
> + try:
> + result = subprocess.check_output([wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT)
> + version = result.decode('utf-8').split()[1]
> + if StrictVersion(version) >= StrictVersion("1.8.7"):
> + d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
> + except subprocess.CalledProcessError as e:
> + bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
> }
>
> do_configure[prefuncs] += "waf_preconfigure"
>
More information about the Openembedded-core
mailing list