[oe-commits] org.oe.dev bitbake.conf: Fix TERMCMD handling and a typo (from Poky)

[rpurdie commit]

bitbake.conf: Fix TERMCMD handling and a typo (from Poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 64520e9d704d19c2af6cd6b7e966e4864a103a41
ViewMTN: http://monotone.openembedded.org/revision/info/64520e9d704d19c2af6cd6b7e966e4864a103a41
Files:
1
conf/bitbake.conf
Diffs:

#
# mt diff -r3fad086a16ec8a047cac49179b73d9eab555efaf -r64520e9d704d19c2af6cd6b7e966e4864a103a41
#
# 
# 
# patch "conf/bitbake.conf"
#  from [fc5979091cb32e1f5a1fa50a620ae19e714204a3]
#    to [4ed306ec9f44c19fe02153d4d9a25294d8358687]
# 
============================================================
--- conf/bitbake.conf	fc5979091cb32e1f5a1fa50a620ae19e714204a3
+++ conf/bitbake.conf	4ed306ec9f44c19fe02153d4d9a25294d8358687
@@ -443,15 +443,16 @@ SHELLRCCMD = "bash --rcfile $TERMRCFILE"
 ##################################################################
 
 SHELLRCCMD = "bash --rcfile $TERMRCFILE"
+export SHELLCMDS = "${SHELLRCCMD}"
 # Some common terminal programs to choose from
 GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"'
-GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x ${SHELLRCCMD}'
+GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS'
 SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"'
-SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} ${SHELLRCCMD}'
+SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS'
 XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"'
-XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e ${SHELLRCCMD}'
+XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS'
 KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"'
-KONSOLE_TERMCMDRUN = '${KCONSOLE_TERMCMD} -e ${SHELLRCCMD}'
+KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS'
 
 # Set a default
 TERMCMD ?= "${GNOME_TERMCMD}"