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

[git version control]

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

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

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

---

 recipes/images/opie-image.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/recipes/images/opie-image.bb b/recipes/images/opie-image.bb
index fec6103..4a984a0 100644
--- a/recipes/images/opie-image.bb
+++ b/recipes/images/opie-image.bb
@@ -8,7 +8,8 @@ IMAGE_INSTALL = "task-base-extended task-opie-base task-opie-base-applets \
 		    task-opie-base-settings task-opie-base-decorations \
 		    task-opie-base-styles task-opie-base-pim \
 		    task-opie-extra-settings \
-		    task-opie-bluetooth task-opie-irda \
+  ${@base_contains("COMBINED_FEATURES", "bluetooth", "task-opie-bluetooth", "",d)} \
+  ${@base_contains("COMBINED_FEATURES", "irda", "task-opie-irda", "",d)} \
                     ${ANGSTROM_EXTRA_INSTALL} "
 
 # create /etc/timestamp from build date