mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead

Browse Source 
(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]
This commit is contained in:
Richard Purdie
2011-11-03 22:02:43 +00:00
parent 9d1f10ed01
commit 426ad82106
3 changed files with 4 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/sanity.bbclass
-13
View File
@@ -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"