diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-03 22:02:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-04 17:05:18 +0000 |
| commit | ddb825c87dd3e59d50841a993080a00d1459b1e7 (patch) | |
| tree | 1f0c7e3a7323c7a64f4ba2cbfd53bbbd3e16c9c2 /meta/classes/sanity.bbclass | |
| parent | 9e0a21dda24f285a1c4878488e887485a749f3f2 (diff) | |
| download | openembedded-core-ddb825c87dd3e59d50841a993080a00d1459b1e7.tar.gz openembedded-core-ddb825c87dd3e59d50841a993080a00d1459b1e7.tar.bz2 openembedded-core-ddb825c87dd3e59d50841a993080a00d1459b1e7.zip | |
bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Yes, this one is against meta-yocto, I'll fix it to apply the same
change to OE-Core's local.conf.sample in the final version]
Diffstat (limited to 'meta/classes/sanity.bbclass')
| -rw-r--r-- | meta/classes/sanity.bbclass | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 406740819c..3f42b4f7cd 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -331,19 +331,6 @@ 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' - 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 - elif "konsole" in term: - import oe.terminal - vernum = oe.terminal.check_konsole_version(term) - if vernum: - if vernum.split('.')[0] == '2': - messages = messages + 'Konsole from KDE 4.x will not work as TERMCMD/TERMCMDRUN, please specify a different terminal or set PATCHRESOLVE = "noop" to disable interactive patch resolution.\n' - 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" |