6 files changed, 5 insertions, 48 deletions
diff --git a/meta/packages/images/poky-image-base.bb b/meta/packages/images/poky-image-base.bb
index 13545d9842..6122ce78d9 100644
--- a/meta/packages/images/poky-image-base.bb
+++ b/meta/packages/images/poky-image-base.bb
@@ -2,4 +2,4 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-require poky-image.inc
+inherit poky-image
diff --git a/meta/packages/images/poky-image-core.bb b/meta/packages/images/poky-image-core.bb
index 431a1c583e..917a29a2ff 100644
--- a/meta/packages/images/poky-image-core.bb
+++ b/meta/packages/images/poky-image-core.bb
@@ -4,4 +4,4 @@
 
 IMAGE_FEATURES += "apps-core"
 
-require poky-image.inc
+inherit poky-image
diff --git a/meta/packages/images/poky-image-minimal.bb b/meta/packages/images/poky-image-minimal.bb
index 88c04666db..3274a0861b 100644
--- a/meta/packages/images/poky-image-minimal.bb
+++ b/meta/packages/images/poky-image-minimal.bb
@@ -7,7 +7,7 @@ IMAGE_INSTALL = "task-poky-boot"
 
 IMAGE_LINGUAS = " "
 
-require poky-image.inc
+inherit poky-image
 
 # remove not needed ipkg informations
 ROOTFS_POSTPROCESS_COMMAND += "rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/"
diff --git a/meta/packages/images/poky-image-sato.bb b/meta/packages/images/poky-image-sato.bb
index 51632f6258..98b6754ad3 100644
--- a/meta/packages/images/poky-image-sato.bb
+++ b/meta/packages/images/poky-image-sato.bb
@@ -4,4 +4,4 @@
 
 IMAGE_FEATURES += "apps-core apps-pda"
 
-require poky-image.inc
+inherit poky-image
diff --git a/meta/packages/images/poky-image-sdk.bb b/meta/packages/images/poky-image-sdk.bb
index fd8fc272fc..7608f1fec9 100644
--- a/meta/packages/images/poky-image-sdk.bb
+++ b/meta/packages/images/poky-image-sdk.bb
@@ -4,4 +4,4 @@
 
 IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
 
-require poky-image.inc
+inherit poky-image
diff --git a/meta/packages/images/poky-image.inc b/meta/packages/images/poky-image.inc
deleted file mode 100644
index 872f3c8028..0000000000
--- a/meta/packages/images/poky-image.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-# Common for Poky images
-#
-# Copyright (C) 2007 OpenedHand LTD
-
-# IMAGE_FEATURES control content of images built with Poky.
-# 
-# By default we install task-poky-boot and task-poky-boot-extras packages - this
-# gives us working (console only) rootfs.
-#
-# "apps-core", "apps-pda" and other tasks are defined in task-poky recipe and have
-# to add needed packages for selected task.
-#
-
-DISTRO_TASKS += '\
-    ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-poky-boot-extras-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-poky-boot-extras-dev", "",d)} \
-	\
-    ${@base_contains("IMAGE_FEATURES", "apps-core", "task-poky-base", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-poky-base-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-poky-base-dev", "",d)} \
-	\
-    ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-poky-standard", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-poky-standard-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-poky-standard-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-poky-sdk", "",d)} \    
-    ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-poky-sdk-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-poky-devtools", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-poky-devtools-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-poky-devtools-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "test-tools", "task-poky-testapps", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-poky-testapps-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
-    '
-
-IMAGE_INSTALL ?= "${DISTRO_TASKS}"
-
-inherit image