bitbake.conf: Allow overriding of SHELLRCCMD

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2745 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index acf48fb848b5f92f18a5bf77be66e2fb31e80f8a..55c9fb5d54316c3af0b2d178bc174357f55b9431 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -395,15 +395,16 @@ SRC_URI = "file://${FILE}"
 ##################################################################
 
 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 = '${KCONSOLE_TERMCMD} -e $SHELLCMDS'
 
 # Set a default
 TERMCMD ?= "${GNOME_TERMCMD}"