summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf20
-rw-r--r--meta/packages/images/oh-image-base.bb4
-rw-r--r--meta/packages/images/oh-image-core.bb3
-rw-r--r--meta/packages/images/oh-image-minimal.bb3
-rw-r--r--meta/packages/images/oh-image-pda.bb4
-rw-r--r--meta/packages/images/oh-image-sdk.bb4
-rw-r--r--meta/packages/images/poky-image.inc43
7 files changed, 51 insertions, 30 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index aa64cc7544..78cc0e8ab1 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -204,27 +204,7 @@ IMAGE_FEATURES ?= ""
204 204
205DISTRO_TASKS = "\ 205DISTRO_TASKS = "\
206 task-oh-boot \ 206 task-oh-boot \
207 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg", "",d)} \
208 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev", "",d)} \
209 task-oh-boot-extras \ 207 task-oh-boot-extras \
210 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-extras-dbg", "",d)} \
211 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-extras-dev", "",d)} \
212 ${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
213 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
214 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
215 ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
216 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
217 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
218 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \
219 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
220 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
221 ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
222 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
223 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
224 ${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
225 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
226 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
227 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \
228 " 208 "
229 209
230# 210#
diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
index e10c907184..13545d9842 100644
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -2,6 +2,4 @@
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4 4
5IMAGE_INSTALL = "${DISTRO_TASKS}" 5require poky-image.inc
6inherit image
7
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index b069a82d88..431a1c583e 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -3,6 +3,5 @@
3# 3#
4 4
5IMAGE_FEATURES += "apps-core" 5IMAGE_FEATURES += "apps-core"
6IMAGE_INSTALL = "${DISTRO_TASKS}"
7inherit image
8 6
7require poky-image.inc
diff --git a/meta/packages/images/oh-image-minimal.bb b/meta/packages/images/oh-image-minimal.bb
index 567caaac42..edb29d250e 100644
--- a/meta/packages/images/oh-image-minimal.bb
+++ b/meta/packages/images/oh-image-minimal.bb
@@ -3,7 +3,8 @@
3# 3#
4 4
5IMAGE_INSTALL = "task-oh-boot" 5IMAGE_INSTALL = "task-oh-boot"
6inherit image 6
7require poky-image.inc
7 8
8# remove not needed stuff (locale support and ipkg support) 9# remove not needed stuff (locale support and ipkg support)
9ROOTFS_POSTPROCESS_COMMAND += "rm -rf ${IMAGE_ROOTFS}/usr/share/i18n/ ${IMAGE_ROOTFS}/usr/lib/ipkg/" 10ROOTFS_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 7056e47248..51632f6258 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -3,5 +3,5 @@
3# 3#
4 4
5IMAGE_FEATURES += "apps-core apps-pda" 5IMAGE_FEATURES += "apps-core apps-pda"
6IMAGE_INSTALL = "${DISTRO_TASKS}" 6
7inherit image 7require poky-image.inc
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index 61f9e26b18..fd8fc272fc 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -3,5 +3,5 @@
3# 3#
4 4
5IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs" 5IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
6IMAGE_INSTALL = "${DISTRO_TASKS}" 6
7inherit image 7require poky-image.inc
diff --git a/meta/packages/images/poky-image.inc b/meta/packages/images/poky-image.inc
new file mode 100644
index 0000000000..6f1bed9760
--- /dev/null
+++ b/meta/packages/images/poky-image.inc
@@ -0,0 +1,43 @@
1# Common for Poky images
2#
3# Copyright (C) 2007 OpenedHand LTD
4
5# IMAGE_FEATURES control content of images built with Poky.
6#
7# By default we install task-oh-boot and task-oh-boot-extras packages - this
8# gives us working (console only) rootfs.
9#
10# "apps-core", "apps-pda" and other tasks are defined in task-oh recipe and have
11# to add needed packages for selected task.
12#
13
14DISTRO_TASKS += '\
15 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg task-oh-boot-extras-dbg", "",d)} \
16 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev task-oh-boot-extras-dev", "",d)} \
17 \
18 ${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
19 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
20 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
21 \
22 ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
23 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
24 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
25 \
26 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \
27 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
28 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
29 \
30 ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
31 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
32 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
33 \
34 ${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
35 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
36 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
37 \
38 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \
39 '
40
41IMAGE_INSTALL ?= "${DISTRO_TASKS}"
42
43inherit image