diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-01-18 10:07:32 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-20 21:36:58 +0000 |
| commit | 4de544015b41cde2938d8bb00fec48f470e6d7fb (patch) | |
| tree | 5e003a6cc675534b6190cf873d607d1e2a180d9d /meta | |
| parent | 5246c996e9f42bc9bf4d9f4cb7d394610676e976 (diff) | |
| download | openembedded-core-4de544015b41cde2938d8bb00fec48f470e6d7fb.tar.gz openembedded-core-4de544015b41cde2938d8bb00fec48f470e6d7fb.tar.bz2 openembedded-core-4de544015b41cde2938d8bb00fec48f470e6d7fb.zip | |
sanity.bbclass: Disable TERMCMD checking with noop patching
If PATCHRESOLVE is set to "noop", then it isn't supposed to try and
resolve patches at all, and thus does not need TERMCMD. Therefore,
make sure Poky doesn't check for (and possibly fail at finding)
TERMCMD if it isn't needed in the first place.
Signed-off-by: Derek Buitenhuis <dbuitenh@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/sanity.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 315fc34728..ccf40fb676 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -189,11 +189,12 @@ def check_sanity(e): if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' - # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating - termcmd = data.getVar("TERMCMD", e.data, True) - term = termcmd.split()[0] - if not check_app_exists(term, e.data): - messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term + if data.getVar('PATCHRESOLVE', e.data, True) != 'noop': + # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating + termcmd = data.getVar("TERMCMD", e.data, True) + term = termcmd.split()[0] + if not check_app_exists(term, e.data): + messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term if os.path.basename(os.readlink('/bin/sh')) == 'dash': messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n" |