diff options
author | Richard Purdie <richard@openedhand.com> | 2006-08-30 22:11:12 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-08-30 22:11:12 +0000 |
commit | b9f06d1671aa2606810aa9edd1c056c5c2d3cf74 (patch) | |
tree | fc5aa0eef637e2a94ef3888f705e530120ecdf25 /meta | |
parent | c1ab349f631a881104cca6615c8bbe365e0ef057 (diff) | |
download | poky-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.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/devshell.bbclass | 13 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 2 |
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 | |||
572 | do_build = "" | 572 | do_build = "" |
573 | do_build[func] = "1" | 573 | do_build[func] = "1" |
574 | 574 | ||
575 | do_devshell[dirs] = "${S}" | ||
576 | do_devshell[nostamp] = 1 | ||
577 | do_devshell[interactive] = 1 | ||
578 | base_do_devshell() { | ||
579 | bash -i | ||
580 | } | ||
581 | addtask 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 |
696 | inherit patch | 688 | inherit patch |
697 | 689 | ||
698 | 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 | 690 | EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage |
699 | 691 | ||
700 | MIRRORS[func] = "0" | 692 | MIRRORS[func] = "0" |
701 | MIRRORS () { | 693 | 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 @@ | |||
1 | EXTRA_OEMAKE[export] = 1 | ||
2 | |||
3 | do_devshell[dirs] = "${S}" | ||
4 | do_devshell[nostamp] = 1 | ||
5 | do_devshell[interactive] = 1 | ||
6 | devshell_do_devshell() { | ||
7 | bash -i | ||
8 | } | ||
9 | addtask devshell | ||
10 | |||
11 | |||
12 | EXPORT_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 | ||
10 | MAINTAINER_poky = "OpenedHand <poky@openedhand.com>" | 10 | MAINTAINER_poky = "OpenedHand <poky@openedhand.com>" |
11 | 11 | ||
12 | INHERIT += " package_ipk debian multimachine poky " | 12 | INHERIT += " 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" |
15 | TARGET_OS = "linux" | 15 | TARGET_OS = "linux" |