summaryrefslogtreecommitdiffstats
path: root/meta/classes
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 /meta/classes
parent95198984dfc15e6b20ee36049d276f7122f78753 (diff)
downloadpoky-03c0969ef80acf0cf3a3d1d3485df61081fafc1b.tar.gz
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
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/poky-image.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 82f11b7037..41d5527960 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -24,7 +24,9 @@
24# - dbg-pkgs - debug packages 24# - dbg-pkgs - debug packages
25# 25#
26 26
27DISTRO_TASKS += '\ 27POKY_BASE_INSTALL = '\
28 task-poky-boot \
29 task-base-extended \
28 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \ 30 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \
29 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \ 31 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \
30 \ 32 \
@@ -73,7 +75,7 @@ DISTRO_TASKS += '\
73 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ 75 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
74 ' 76 '
75 77
76IMAGE_INSTALL ?= "${DISTRO_TASKS}" 78IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
77 79
78X11_IMAGE_FEATURES = "x11-base apps-x11-core" 80X11_IMAGE_FEATURES = "x11-base apps-x11-core"
79SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico" 81SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico"