summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-03 22:02:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-04 17:05:53 +0000
commit426ad821065c50fc008a140e5b2334d2c97511c3 (patch)
treec0c5fc0c6a22e9c12dbbb20307328132ef2bf4ca /meta/classes
parent9d1f10ed012de6976141a29ba483e0b96781fe28 (diff)
downloadpoky-426ad821065c50fc008a140e5b2334d2c97511c3.tar.gz
bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead
(From OE-Core rev: ddb825c87dd3e59d50841a993080a00d1459b1e7) 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')
-rw-r--r--meta/classes/sanity.bbclass13
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):
331 if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': 331 if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
332 messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' 332 messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
333 333
334 if data.getVar('PATCHRESOLVE', e.data, True) != 'noop':
335 # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating
336 termcmd = data.getVar("TERMCMD", e.data, True)
337 term = termcmd.split()[0]
338 if not check_app_exists(term, e.data):
339 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
340 elif "konsole" in term:
341 import oe.terminal
342 vernum = oe.terminal.check_konsole_version(term)
343 if vernum:
344 if vernum.split('.')[0] == '2':
345 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'
346
347 if os.path.basename(os.readlink('/bin/sh')) == 'dash': 334 if os.path.basename(os.readlink('/bin/sh')) == 'dash':
348 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" 335 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"
349 336