8 files changed, 50 insertions, 31 deletions
diff --git a/meta-extras/packages/images/oh-image-extras.bb b/meta-extras/packages/images/oh-image-extras.bb
index b62774205..d9b879683 100644
--- a/meta-extras/packages/images/oh-image-extras.bb
+++ b/meta-extras/packages/images/oh-image-extras.bb
@@ -1,28 +1,9 @@
-PR = "r9"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
-export IMAGE_BASENAME = "oh-extras"
+IMAGE_FEATURES += "apps-core apps-pda"
 
-GUI_MACHINE_CLASS ?= "none"
+require poky-image.inc
 
-XSERVER ?= "xserver-kdrive-fbdev"
-
-DEPENDS = "\
-    task-oh \
-    task-oh-extras"
-    
-RDEPENDS = "\
-    task-base \
-    task-oh-boot \
-    task-oh-boot-extras \
-    task-oh-base \
-    task-oh-standard \
-    task-oh-testapps \
-    task-oh-devtools \
-    task-oh-extraapps \
-    ${XSERVER} "
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
-#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
-
-inherit image
-LICENSE = MIT
+IMAGE_INSTALL += "task-oh-extraapps"
diff --git a/meta-extras/packages/images/poky-image.inc b/meta-extras/packages/images/poky-image.inc
new file mode 100644
index 000000000..6f1bed976
--- /dev/null
+++ b/meta-extras/packages/images/poky-image.inc
@@ -0,0 +1,43 @@
+# Common for Poky images
+#
+# Copyright (C) 2007 OpenedHand LTD
+
+# IMAGE_FEATURES control content of images built with Poky.
+# 
+# By default we install task-oh-boot and task-oh-boot-extras packages - this
+# gives us working (console only) rootfs.
+#
+# "apps-core", "apps-pda" and other tasks are defined in task-oh recipe and have
+# to add needed packages for selected task.
+#
+
+DISTRO_TASKS += '\
+    ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg task-oh-boot-extras-dbg", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev task-oh-boot-extras-dev", "",d)} \
+	\
+    ${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
+	\
+    ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
+    \
+    ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \    
+    ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
+    \
+    ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
+    \
+    ${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
+    \
+    ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \
+    '
+
+IMAGE_INSTALL ?= "${DISTRO_TASKS}"
+
+inherit image
diff --git a/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb b/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
index e47c00e76..840c7f8ae 100644
--- a/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
+++ b/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "zlib"
 DESCRIPTION = "Library for interacting with ID3 tags."
 LICENSE = "GPL"
diff --git a/meta-extras/packages/libmad/libmad_0.15.0b.bb b/meta-extras/packages/libmad/libmad_0.15.0b.bb
index b3614db05..d6e6dda1d 100644
--- a/meta-extras/packages/libmad/libmad_0.15.0b.bb
+++ b/meta-extras/packages/libmad/libmad_0.15.0b.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "MPEG Audio Decoder Library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "libid3tag"
 LICENSE = "GPL"
 PR = "r2"
diff --git a/meta-extras/packages/madplay/madplay_0.15.2b.bb b/meta-extras/packages/madplay/madplay_0.15.2b.bb
index ba2d184a2..d942b965e 100644
--- a/meta-extras/packages/madplay/madplay_0.15.2b.bb
+++ b/meta-extras/packages/madplay/madplay_0.15.2b.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player"
-MAINTAINER = "Maciej Swiniarski <luzik@gda.pl>"
 SECTION = "console/multimedia"
 DEPENDS = "libmad"
 LICENSE = "GPL"
diff --git a/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb b/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
index b06df2535..ceda4ff81 100644
--- a/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
+++ b/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GPS navigation/map display software"
 LICENSE = "GPL"
-DEPENDS = "sqlite3 gtk+ gnome-vfs-dbus dbus bluez-libs"
+DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs"
 RDEPENDS = "bluez-utils"
 PV = "1.2.4+svn${SRCDATE}"
 PR = "r1"
diff --git a/meta-extras/packages/python/python-native_2.4.0.bb b/meta-extras/packages/python/python-native_2.4.0.bb
index 00092d1e1..195d4fc52 100644
--- a/meta-extras/packages/python/python-native_2.4.0.bb
+++ b/meta-extras/packages/python/python-native_2.4.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = ""
 PR = "r0"
 
diff --git a/meta-extras/packages/tasks/task-oh-extras.bb b/meta-extras/packages/tasks/task-oh-extras.bb
index fc2a3e090..c9ad02cb5 100644
--- a/meta-extras/packages/tasks/task-oh-extras.bb
+++ b/meta-extras/packages/tasks/task-oh-extras.bb
@@ -1,6 +1,5 @@
 PACKAGES = "task-oh-extraapps"
 DESCRIPTION = "Extras Tasks for OpenedHand Poky"
-MAINTAINER = "Richard Purdie <richard@openedhand.com>"
 PR = "r0"
 
 ALLOW_EMPTY = "1"