[oe-commits] Khem Raj : meta-angstrom-2007.bb, meta-opie.bb: task-opie-bluetooth is added only if it appeas in COMBINED_FEATURES

[git version control]

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

Author: Khem Raj <raj.khem at gmail.com>
Date:   Sat Aug 28 12:08:50 2010 -0700

meta-angstrom-2007.bb,meta-opie.bb: task-opie-bluetooth is added only if it appeas in COMBINED_FEATURES

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 recipes/meta/meta-angstrom-2007.bb |    1 -
 recipes/meta/meta-opie.bb          |    6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/meta/meta-angstrom-2007.bb b/recipes/meta/meta-angstrom-2007.bb
index 8355b10..fbd7f0b 100644
--- a/recipes/meta/meta-angstrom-2007.bb
+++ b/recipes/meta/meta-angstrom-2007.bb
@@ -15,7 +15,6 @@ RDEPENDS_${PN} += " \
 
 # Browsers know to work on all archs
 RDEPENDS_${PN} += " \
-         gpe-mini-browser \
          midori \
 	 minimo \
          openmoko-browser2 \
diff --git a/recipes/meta/meta-opie.bb b/recipes/meta/meta-opie.bb
index 0a8ed86..1584765 100644
--- a/recipes/meta/meta-opie.bb
+++ b/recipes/meta/meta-opie.bb
@@ -7,11 +7,13 @@ RDEPENDS_${PN} = "task-opie-applets task-opie-apps 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-styles \
+            ${@base_contains("COMBINED_FEATURES", "bluetooth", "task-opie-bluetooth", "",d)} \
             task-opie-datebookplugins task-opie-decorations \
             task-opie-extra-apps task-opie-extra-settings \
             task-opie-extra-styles task-opie-extra-games \
-            task-opie-games task-opie-inputmethods task-opie-irda \
+            ${@base_contains("COMBINED_FEATURES", "irda", "task-opie-irda", "",d)} \
+            task-opie-games task-opie-inputmethods \
             task-opie-multimedia task-opie-pim task-opie-settings \
             task-opie-styles task-opie-todayplugins task-opie-wlan"