[oe-commits] Rolf Leggewie : task-opie: make inclusion of irda and bluetooth tasks contingent upon COMBINED_FEATURES

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a4ee92d0a8ce317edbc36288e79236865ba87118
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a4ee92d0a8ce317edbc36288e79236865ba87118

Author: Rolf Leggewie <oe-devel at rolf.leggewie.biz>
Date:   Wed Jun 24 23:36:03 2009 +0200

task-opie: make inclusion of irda and bluetooth tasks contingent upon COMBINED_FEATURES

---

 recipes/tasks/task-opie.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/tasks/task-opie.bb b/recipes/tasks/task-opie.bb
index 41dd92a..a1699ad 100644
--- a/recipes/tasks/task-opie.bb
+++ b/recipes/tasks/task-opie.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
 LICENSE = "MIT"
 
-PR = "r12"
+PR = "r13"
 
 inherit task
 
@@ -12,11 +12,11 @@ PACKAGES = "task-opie-base \
             task-opie-base-applets task-opie-base-apps \
             task-opie-base-decorations task-opie-base-inputmethods \
             task-opie-base-pim task-opie-base-settings \
-            task-opie-base-styles task-opie-bluetooth \
-            task-opie-base-todayplugins \
+            task-opie-base-styles task-opie-base-todayplugins \
             task-opie-extra-settings \
             task-opie-extra-styles \
-            task-opie-irda \
+  ${@base_contains("COMBINED_FEATURES", "bluetooth", "task-opie-bluetooth", "",d)} \
+  ${@base_contains("COMBINED_FEATURES", "irda", "task-opie-irda", "",d)} \
            "
 
 RDEPENDS_task-opie-everything := "${PACKAGES}"