From: Richard Purdie <rpurdie@linux.intel.com>
Date: Sun, 28 Nov 2010 17:42:36 +0000 (+0000)
Subject: devshell: Clean up devshell code so this task doesn't polute the global namespace
X-Git-Tag: 2011-1~3563
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c91caeea89845a88fa069db7218e6eb99843e2a0;p=openembedded-core.git

devshell: Clean up devshell code so this task doesn't polute the global namespace

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index d08056bf11..4fb3e63d21 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -1,15 +1,14 @@
-EXTRA_OEMAKE[export] = "1"
-
 do_devshell[dirs] = "${S}"
 do_devshell[nostamp] = "1"
 
-export DISPLAY
-export DBUS_SESSION_BUS_ADDRESS
-export XAUTHORITY ?= "${HOME}/.Xauthority"
-export FAKEROOTENV
+XAUTHORITY ?= "${HOME}/.Xauthority"
 
 devshell_do_devshell() {
+	export DISPLAY='${DISPLAY}'
+	export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
+	export XAUTHORITY='${XAUTHORITY}'
 	export TERMWINDOWTITLE="Bitbake Developer Shell"
+	export EXTRA_OEMAKE='${EXTRA_OEMAKE}'
 	${TERMCMD}
 	if [ $? -ne 0 ]; then
 	    echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."