Cleaned up task-poky and Poky images.

By default we install task-poky-boot and task-base. Additional stuff was split
to several tasks and each got IMAGE_FEATURE.


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2037 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 5 insertions, 3 deletions

diff --git a/meta/packages/images/poky-image-base.bb b/meta/packages/images/poky-image-base.bb
index 6122ce78d9..d214642c40 100644
--- a/meta/packages/images/poky-image-base.bb
+++ b/meta/packages/images/poky-image-base.bb
@@ -2,4 +2,6 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
+IMAGE_FEATURES += "apps-console-core"
+
 inherit poky-image
diff --git a/meta/packages/images/poky-image-core.bb b/meta/packages/images/poky-image-core.bb
index 917a29a2ff..edc50fa74b 100644
--- a/meta/packages/images/poky-image-core.bb
+++ b/meta/packages/images/poky-image-core.bb
@@ -2,6 +2,6 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-IMAGE_FEATURES += "apps-core"
+IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
 
 inherit poky-image
diff --git a/meta/packages/images/poky-image-sato.bb b/meta/packages/images/poky-image-sato.bb
index 98b6754ad3..58eb5d68c2 100644
--- a/meta/packages/images/poky-image-sato.bb
+++ b/meta/packages/images/poky-image-sato.bb
@@ -2,6 +2,6 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-IMAGE_FEATURES += "apps-core apps-pda"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
 
 inherit poky-image
diff --git a/meta/packages/images/poky-image-sdk.bb b/meta/packages/images/poky-image-sdk.bb
index 7608f1fec9..e6454db658 100644
--- a/meta/packages/images/poky-image-sdk.bb
+++ b/meta/packages/images/poky-image-sdk.bb
@@ -2,6 +2,6 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-tools dev-pkgs dbg-pkgs"
 
 inherit poky-image