summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-08-30 22:11:12 +0000
committerRichard Purdie <richard@openedhand.com>2006-08-30 22:11:12 +0000
commitb9f06d1671aa2606810aa9edd1c056c5c2d3cf74 (patch)
treefc5aa0eef637e2a94ef3888f705e530120ecdf25 /meta
parentc1ab349f631a881104cca6615c8bbe365e0ef057 (diff)
downloadpoky-b9f06d1671aa2606810aa9edd1c056c5c2d3cf74.tar.gz
devshell: Convert to its own class and add to poky.conf by default. Export EXTRA_OEMAKE to devshell.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@683 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass10
-rw-r--r--meta/classes/devshell.bbclass13
-rw-r--r--meta/conf/distro/poky.conf2
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
572do_build = "" 572do_build = ""
573do_build[func] = "1" 573do_build[func] = "1"
574 574
575do_devshell[dirs] = "${S}"
576do_devshell[nostamp] = 1
577do_devshell[interactive] = 1
578base_do_devshell() {
579 bash -i
580}
581addtask devshell
582
583# Functions that update metadata based on files outputted 575# Functions that update metadata based on files outputted
584# during the build process. 576# during the build process.
585 577
@@ -695,7 +687,7 @@ python () {
695# Patch handling 687# Patch handling
696inherit patch 688inherit patch
697 689
698EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_devshell 690EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage
699 691
700MIRRORS[func] = "0" 692MIRRORS[func] = "0"
701MIRRORS () { 693MIRRORS () {
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 @@
1EXTRA_OEMAKE[export] = 1
2
3do_devshell[dirs] = "${S}"
4do_devshell[nostamp] = 1
5do_devshell[interactive] = 1
6devshell_do_devshell() {
7 bash -i
8}
9addtask devshell
10
11
12EXPORT_FUNCTIONS do_devshell
13
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"
9 9
10MAINTAINER_poky = "OpenedHand <poky@openedhand.com>" 10MAINTAINER_poky = "OpenedHand <poky@openedhand.com>"
11 11
12INHERIT += " package_ipk debian multimachine poky " 12INHERIT += " package_ipk debian multimachine poky devshell "
13# For some reason, this doesn't work 13# For some reason, this doesn't work
14# TARGET_OS ?= "linux" 14# TARGET_OS ?= "linux"
15TARGET_OS = "linux" 15TARGET_OS = "linux"