diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-08-28 12:08:50 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-09-01 14:27:46 -0700 |
| commit | 932d107f7c14fb7a9c8758c6f2baf2bd77a96dde (patch) | |
| tree | 178dc2e858c8d6328d2d06f5197b2da1e0539c72 /recipes | |
| parent | e56e07be953098f76cf7f861b02ee9bed153f609 (diff) | |
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@gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/meta/meta-angstrom-2007.bb | 1 | ||||
| -rw-r--r-- | 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 8355b10810..fbd7f0b043 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 0a8ed86a9f..15847656d7 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" |