Poky images: move IMAGE_FEATURES stuff to separate file, simplify image recipes

poky-image.inc contain DISTRO_TASKS stuff related to image content (was in poky.conf)


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

7 files changed, 51 insertions, 30 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index aa64cc754..78cc0e8ab 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -204,27 +204,7 @@ IMAGE_FEATURES ?= ""
 
 DISTRO_TASKS = "\
     task-oh-boot \
-    ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev", "",d)} \
     task-oh-boot-extras \
-    ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-extras-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "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)} \
     "
 
 #
diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
index e10c90718..13545d984 100644
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -2,6 +2,4 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-IMAGE_INSTALL = "${DISTRO_TASKS}"
-inherit image
-
+require poky-image.inc
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index b069a82d8..431a1c583 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -3,6 +3,5 @@
 #
 
 IMAGE_FEATURES += "apps-core"
-IMAGE_INSTALL = "${DISTRO_TASKS}"
-inherit image
 
+require poky-image.inc
diff --git a/meta/packages/images/oh-image-minimal.bb b/meta/packages/images/oh-image-minimal.bb
index 567caaac4..edb29d250 100644
--- a/meta/packages/images/oh-image-minimal.bb
+++ b/meta/packages/images/oh-image-minimal.bb
@@ -3,7 +3,8 @@
 #
 
 IMAGE_INSTALL = "task-oh-boot"
-inherit image
+
+require poky-image.inc
 
 # remove not needed stuff (locale support and ipkg support)
 ROOTFS_POSTPROCESS_COMMAND += "rm -rf ${IMAGE_ROOTFS}/usr/share/i18n/ ${IMAGE_ROOTFS}/usr/lib/ipkg/"
diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb
index 7056e4724..51632f625 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -3,5 +3,5 @@
 #
 
 IMAGE_FEATURES += "apps-core apps-pda"
-IMAGE_INSTALL = "${DISTRO_TASKS}"
-inherit image
+
+require poky-image.inc
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index 61f9e26b1..fd8fc272f 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -3,5 +3,5 @@
 #
 
 IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
-IMAGE_INSTALL = "${DISTRO_TASKS}"
-inherit image
+
+require poky-image.inc
diff --git a/meta/packages/images/poky-image.inc b/meta/packages/images/poky-image.inc
new file mode 100644
index 000000000..6f1bed976
--- /dev/null
+++ b/meta/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