From: Joshua Lock <josh@linux.intel.com>
Date: Wed, 23 Feb 2011 11:59:59 +0000 (+0000)
Subject: Ensure Bash is used when spawning terminals
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~46408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aa31b5c0a5878ebdd50e6b7be9284a7f6a7d0c2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 4fb3e63d21c..5f262f426e9 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 a1b13547883..5d9b86a8191 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."