3 files changed, 15 insertions, 10 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index eef0efa926..940e7ac7a4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -572,14 +572,6 @@ addtask build after do_populate_staging
 do_build = ""
 do_build[func] = "1"
 
-do_devshell[dirs] = "${S}"
-do_devshell[nostamp] = 1
-do_devshell[interactive] = 1
-base_do_devshell() {
-        bash -i
-}
-addtask devshell
-
 # Functions that update metadata based on files outputted
 # during the build process.
 
@@ -695,7 +687,7 @@ python () {
 # Patch handling
 inherit patch
 
-EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_devshell
+EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage
 
 MIRRORS[func] = "0"
 MIRRORS () {
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
new file mode 100644
index 0000000000..7948b65418
--- /dev/null
+++ b/meta/classes/devshell.bbclass
@@ -0,0 +1,13 @@
+EXTRA_OEMAKE[export] = 1
+
+do_devshell[dirs] = "${S}"
+do_devshell[nostamp] = 1
+do_devshell[interactive] = 1
+devshell_do_devshell() {
+        bash -i
+}
+addtask devshell
+
+
+EXPORT_FUNCTIONS do_devshell
+
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index c326314710..148124ef4c 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -9,7 +9,7 @@ DISTRO_TYPE ?= "release"
 
 MAINTAINER_poky = "OpenedHand <poky@openedhand.com>"
 
-INHERIT += " package_ipk debian multimachine poky "
+INHERIT += " package_ipk debian multimachine poky devshell "
 # For some reason, this doesn't work
 # TARGET_OS ?= "linux"
 TARGET_OS = "linux"