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

diff --git a/recipes/images/opie-image.bb b/recipes/images/opie-image.bb
index fec6103..4a984a0 100644 (file)
--- 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