sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Mark Hatle 2011-01-18 10:07:32 -06:00 committed by Richard Purdie
parent 5246c996e9
commit 4de544015b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta/classes/sanity.bbclass
View File

@ -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"