summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-17 13:38:46 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-17 13:38:46 +0000
commitece438786ed034be60b8742b713ef443ff95ad8f (patch)
tree32cf1750dcdd821a57235b3ab675630f25d620b5
parent70d7d50bb1be55df781fc5e323b2867330932d03 (diff)
downloadopenembedded-core-ece438786ed034be60b8742b713ef443ff95ad8f.tar.gz
openembedded-core-ece438786ed034be60b8742b713ef443ff95ad8f.tar.bz2
openembedded-core-ece438786ed034be60b8742b713ef443ff95ad8f.zip
bitbake.conf: Allow overriding of SHELLRCCMD
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2745 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/bitbake.conf9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index acf48fb848..55c9fb5d54 100644
--- 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}"