diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-03 22:02:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-04 17:05:53 +0000 |
| commit | 426ad821065c50fc008a140e5b2334d2c97511c3 (patch) | |
| tree | c0c5fc0c6a22e9c12dbbb20307328132ef2bf4ca /meta | |
| parent | 9d1f10ed012de6976141a29ba483e0b96781fe28 (diff) | |
| download | ast2050-yocto-poky-426ad821065c50fc008a140e5b2334d2c97511c3.zip ast2050-yocto-poky-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')
| -rw-r--r-- | meta/classes/sanity.bbclass | 13 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 20 |
2 files changed, 0 insertions, 33 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 4067408..3f42b4f 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -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" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9938a67..d405b6a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -589,26 +589,6 @@ FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALS FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" - -################################################################## -# UI/Interaction Configuration -################################################################## - -export SHELLCMDS = "bash" -# Some common terminal programs to choose from -GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' -GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' -SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"' -SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS' -XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"' -XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS' -KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"' -KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS' - -# Set a default -TERMCMD ?= "${XTERM_TERMCMD}" -TERMCMDRUN ?= "${XTERM_TERMCMDRUN}" - ################################################################## # Miscellaneous utilities. ################################################################## |
