Patchwork [1/1] sato-sdk: add mesa-demos application

login
mail settings
Submitter Yu Ke
Date June 9, 2011, 7:03 a.m.
Message ID <3c7d4b99a5326a89880078e929dc538c60591f38.1307602786.git.ke.yu@intel.com>
Download mbox | patch
Permalink /patch/5591/
State New, archived
Headers show

Comments

Yu Ke - June 9, 2011, 7:03 a.m.
Q/A requires more demo applications to test graphics.
This patch add x11-demos feature category, and add it to sato-sdk.
Currently mesa-demos is the only recips in x11-demos, and this can
be extended in the future when more demo apps are added

Fix [YOCTO #1112]

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 meta/classes/core-image.bbclass                 |    1 +
 meta/recipes-sato/images/core-image-sato-sdk.bb |    2 +-
 meta/recipes-sato/tasks/task-core.bb            |    6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index c8c6a57..d00c20a 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -93,6 +93,7 @@  POKY_BASE_INSTALL = '\
     \
     ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
     ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", "x11-demos", "task-core-x11-demos", "",d)} \
     ${POKY_EXTRA_INSTALL} \
     '
 
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index ee9d799..3240a7d 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -2,7 +2,7 @@ 
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs x11-demos"
 
 LICENSE = "MIT"
 
diff --git a/meta/recipes-sato/tasks/task-core.bb b/meta/recipes-sato/tasks/task-core.bb
index a595ad7..22e5754 100644
--- a/meta/recipes-sato/tasks/task-core.bb
+++ b/meta/recipes-sato/tasks/task-core.bb
@@ -6,7 +6,7 @@  DESCRIPTION = "Tasks for OpenedHand Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r34"
+PR = "r35"
 
 PACKAGES = "\
     task-core-apps-console \
@@ -21,6 +21,7 @@  PACKAGES = "\
     task-core-x11-base \
     task-core-x11-base-dbg \
     task-core-x11-base-dev \
+    task-core-x11-demos \
     "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -71,3 +72,6 @@  RDEPENDS_task-core-apps-x11-core = "\
 
 RDEPENDS_task-core-apps-x11-games = "\
     oh-puzzles"
+
+RDEPENDS_task-core-x11-demos = "\
+    mesa-demos"