summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-20 14:56:00 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-20 14:56:00 +0000
commit03c0969ef80acf0cf3a3d1d3485df61081fafc1b (patch)
tree84e6856ca6166d833f92d979610974204de40dd8
parent95198984dfc15e6b20ee36049d276f7122f78753 (diff)
downloadopenembedded-core-03c0969ef80acf0cf3a3d1d3485df61081fafc1b.tar.gz
openembedded-core-03c0969ef80acf0cf3a3d1d3485df61081fafc1b.tar.bz2
openembedded-core-03c0969ef80acf0cf3a3d1d3485df61081fafc1b.tar.xz
openembedded-core-03c0969ef80acf0cf3a3d1d3485df61081fafc1b.zip
poky-image.bbclass: Remove DISTRO_TASKS variable and replace with POKY_BASE_INSTALL
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4516 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/poky-image.bbclass6
-rw-r--r--meta/conf/distro/poky.conf5
-rw-r--r--meta/packages/images/poky-image-clutter.bb2
3 files changed, 5 insertions, 8 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 82f11b703..41d552796 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -24,7 +24,9 @@
# - dbg-pkgs - debug packages
#
-DISTRO_TASKS += '\
+POKY_BASE_INSTALL = '\
+ task-poky-boot \
+ task-base-extended \
${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \
\
@@ -73,7 +75,7 @@ DISTRO_TASKS += '\
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
'
-IMAGE_INSTALL ?= "${DISTRO_TASKS}"
+IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
X11_IMAGE_FEATURES = "x11-base apps-x11-core"
SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a448c5167..14e949fec 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -280,11 +280,6 @@ DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
IMAGE_FEATURES ?= ""
-DISTRO_TASKS = "\
- task-poky-boot \
- task-base-extended \
- "
-
#
# Exclude known broken packages
#
diff --git a/meta/packages/images/poky-image-clutter.bb b/meta/packages/images/poky-image-clutter.bb
index e2bce43bc..a9bf331f7 100644
--- a/meta/packages/images/poky-image-clutter.bb
+++ b/meta/packages/images/poky-image-clutter.bb
@@ -1,7 +1,7 @@
IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
IMAGE_INSTALL = "\
- ${DISTRO_TASKS} \
+ ${POKY_BASE_INSTALL} \
task-poky-clutter-core \
task-poky-clutter-tests \
task-poky-clutter-apps"