summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-01-18 10:07:32 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:36:58 +0000
commit4de544015b41cde2938d8bb00fec48f470e6d7fb (patch)
tree5e003a6cc675534b6190cf873d607d1e2a180d9d /meta
parent5246c996e9f42bc9bf4d9f4cb7d394610676e976 (diff)
downloadpoky-4de544015b41cde2938d8bb00fec48f470e6d7fb.tar.gz
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.bbclass11
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):
189 if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': 189 if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
190 messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' 190 messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
191 191
192 # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating 192 if data.getVar('PATCHRESOLVE', e.data, True) != 'noop':
193 termcmd = data.getVar("TERMCMD", e.data, True) 193 # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating
194 term = termcmd.split()[0] 194 termcmd = data.getVar("TERMCMD", e.data, True)
195 if not check_app_exists(term, e.data): 195 term = termcmd.split()[0]
196 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 196 if not check_app_exists(term, e.data):
197 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
197 198
198 if os.path.basename(os.readlink('/bin/sh')) == 'dash': 199 if os.path.basename(os.readlink('/bin/sh')) == 'dash':
199 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" 200 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"