From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Wed, 24 Jun 2009 21:36:03 +0000 (+0200)
Subject: task-opie: make inclusion of irda and bluetooth tasks contingent upon COMBINED_FEATURES
X-Git-Tag: Release-2010-05/1~3058
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4ee92d0a8ce317edbc36288e79236865ba87118;p=openembedded.git

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

diff --git a/recipes/tasks/task-opie.bb b/recipes/tasks/task-opie.bb
index 41dd92ac7a..a1699ad785 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}"