summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/poky-image.bbclass3
-rw-r--r--meta/recipes-qt/tasks/task-poky-qt.bb20
-rw-r--r--meta/recipes-sato/images/poky-image-sdk.bb2
3 files changed, 23 insertions, 2 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 8d0efae557..5f34ad11d2 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -76,10 +76,11 @@ POKY_BASE_INSTALL = '\
76 \ 76 \
77 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ 77 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
78 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ 78 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
79 79 \
80 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ 80 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
81 \ 81 \
82 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \ 82 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \
83 ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \
83 ${POKY_EXTRA_INSTALL} \ 84 ${POKY_EXTRA_INSTALL} \
84 ' 85 '
85 86
diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-poky-qt.bb
new file mode 100644
index 0000000000..606ebab4e1
--- /dev/null
+++ b/meta/recipes-qt/tasks/task-poky-qt.bb
@@ -0,0 +1,20 @@
1#
2# Copyright (C) 2010 Intel Corporation. All rights reserved
3#
4
5DESCRIPTION = "Qt Tasks for Poky"
6LICENSE = "MIT"
7PR = "r0"
8
9PACKAGES = "\
10 task-poky-qt-demos \
11 task-poky-qt-demos-dbg \
12 task-poky-qt-demos-dev \
13 "
14
15ALLOW_EMPTY = "1"
16
17RDEPENDS_task-poky-qt-demos = "\
18 fotowall \
19 quicky \
20 "
diff --git a/meta/recipes-sato/images/poky-image-sdk.bb b/meta/recipes-sato/images/poky-image-sdk.bb
index 1df832a0b2..c3fbce76c3 100644
--- a/meta/recipes-sato/images/poky-image-sdk.bb
+++ b/meta/recipes-sato/images/poky-image-sdk.bb
@@ -2,6 +2,6 @@
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4 4
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs" 5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs"
6 6
7inherit poky-image 7inherit poky-image