[poky] [PATCH 1/1] sanity.bbclass: Disable TERMCMD checking with noop patching

[Mark Hatle]

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 at windriver.com>
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
---
 meta/classes/sanity.bbclass |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 315fc34..ccf40fb 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -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$
+    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 TERMC$

     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 da$
--
1.7.3.4