summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-02-23 11:59:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-24 15:54:09 +0000
commit6d261a50bac760b55e33c303e9f3f2214338eb4f (patch)
tree739172eeab32b3963fa7e54815694a0e3f1a9f0f
parentedd64c7e864cfe68d01a410a021d6bb1d7cf2c27 (diff)
downloadpoky-6d261a50bac760b55e33c303e9f3f2214338eb4f.tar.gz
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() {
9 export XAUTHORITY='${XAUTHORITY}' 9 export XAUTHORITY='${XAUTHORITY}'
10 export TERMWINDOWTITLE="Bitbake Developer Shell" 10 export TERMWINDOWTITLE="Bitbake Developer Shell"
11 export EXTRA_OEMAKE='${EXTRA_OEMAKE}' 11 export EXTRA_OEMAKE='${EXTRA_OEMAKE}'
12 ${TERMCMD} 12 export SHELLCMDS="bash"
13 ${TERMCMDRUN}
13 if [ $? -ne 0 ]; then 14 if [ $? -ne 0 ]; then
14 echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable." 15 echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
15 exit 1 16 exit 1
@@ -17,6 +18,5 @@ devshell_do_devshell() {
17} 18}
18addtask devshell after do_patch 19addtask devshell after do_patch
19 20
20
21EXPORT_FUNCTIONS do_devshell 21EXPORT_FUNCTIONS do_devshell
22 22
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() {
202 export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}' 202 export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
203 export XAUTHORITY='${XAUTHORITY}' 203 export XAUTHORITY='${XAUTHORITY}'
204 export TERMWINDOWTITLE="${PN} Kernel Configuration" 204 export TERMWINDOWTITLE="${PN} Kernel Configuration"
205 export SHELLCMDS="make menuconfig" 205 export SHELLCMDS="bash make menuconfig"
206 ${TERMCMDRUN} 206 ${TERMCMDRUN}
207 if [ $? -ne 0 ]; then 207 if [ $? -ne 0 ]; then
208 echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable." 208 echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."