summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-02-23 11:59:59 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2011-03-01 11:46:14 +0000
commit9aa31b5c0a5878ebdd50e6b7be9284a7f6a7d0c2 (patch)
treefb80919bcd369c8701d6583cc739e3da8043110b
parent1bf2e12b42a9aca315df65e7227a895f36a58b31 (diff)
downloadopenembedded-core-9aa31b5c0a5878ebdd50e6b7be9284a7f6a7d0c2.tar.gz
openembedded-core-9aa31b5c0a5878ebdd50e6b7be9284a7f6a7d0c2.tar.bz2
openembedded-core-9aa31b5c0a5878ebdd50e6b7be9284a7f6a7d0c2.zip
Ensure Bash is used when spawning terminals
We rely on Bashisms when spawning a terminal so ensure that bash is used when using devshell and menuconfig. Fixes [BUGID #119] Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/classes/devshell.bbclass4
-rw-r--r--meta/classes/kernel.bbclass2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 4fb3e63d21..5f262f426e 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -9,7 +9,8 @@ devshell_do_devshell() {
export XAUTHORITY='${XAUTHORITY}'
export TERMWINDOWTITLE="Bitbake Developer Shell"
export EXTRA_OEMAKE='${EXTRA_OEMAKE}'
- ${TERMCMD}
+ export SHELLCMDS="bash"
+ ${TERMCMDRUN}
if [ $? -ne 0 ]; then
echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
exit 1
@@ -17,6 +18,5 @@ devshell_do_devshell() {
}
addtask devshell after do_patch
-
EXPORT_FUNCTIONS do_devshell
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index a1b1354788..5d9b86a819 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -202,7 +202,7 @@ do_menuconfig() {
export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
export XAUTHORITY='${XAUTHORITY}'
export TERMWINDOWTITLE="${PN} Kernel Configuration"
- export SHELLCMDS="make menuconfig"
+ export SHELLCMDS="bash make menuconfig"
${TERMCMDRUN}
if [ $? -ne 0 ]; then
echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."