diff options
| author | Amanda Brindle <amanda.r.brindle@intel.com> | 2018-03-22 12:12:15 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-25 09:40:42 +0100 |
| commit | b6b6e006f776f3ec47192c2dffab62b124c9082e (patch) | |
| tree | daf4d11dc2724b2aa7c4dc956bb71d730a7827cc /meta | |
| parent | cf6f3c023cfa731ce061949135e255458d474964 (diff) | |
| download | poky-b6b6e006f776f3ec47192c2dffab62b124c9082e.tar.gz | |
waf.bbclass: Throw error if waf doesn't exist
Before, waf.bbclass would fail to catch FileNotFoundError. Now, it will
catch this error and say that waf doesn't exist.
Fixes [YOCTO 12553]
(From OE-Core rev: f8321dedec7abe392f7e49ff8eee0640463adae5)
Signed-off-by: Amanda Brindle <amanda.r.brindle@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/waf.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass index f9a851d075..19e93761b3 100644 --- a/meta/classes/waf.bbclass +++ b/meta/classes/waf.bbclass | |||
| @@ -15,6 +15,8 @@ python waf_preconfigure() { | |||
| 15 | d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") | 15 | d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") |
| 16 | except subprocess.CalledProcessError as e: | 16 | except subprocess.CalledProcessError as e: |
| 17 | bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) | 17 | bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) |
| 18 | except FileNotFoundError: | ||
| 19 | bb.fatal("waf does not exist in %s" % subsrcdir) | ||
| 18 | } | 20 | } |
| 19 | 21 | ||
| 20 | do_configure[prefuncs] += "waf_preconfigure" | 22 | do_configure[prefuncs] += "waf_preconfigure" |