diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2009-08-19 20:56:07 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-08-19 20:56:07 +0000 |
| commit | 3bd6ffb5ba47ff8f6ca3d0741a6c7ff2392c4486 (patch) | |
| tree | 13298eee779cc0aa64628085e0c44a9a8d7e6f7c /recipes/tasks | |
| parent | ada6f217e946c731fbc42d831021aa1fcae28777 (diff) | |
| parent | ac729cee6058e9e601af4869874213ccd129c732 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/tasks')
| -rw-r--r-- | recipes/tasks/task-base.bb | 7 | ||||
| -rw-r--r-- | recipes/tasks/task-mokogateway.bb | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb index 66c26af181..7316d8f911 100644 --- a/recipes/tasks/task-base.bb +++ b/recipes/tasks/task-base.bb @@ -340,13 +340,12 @@ RRECOMMENDS_task-base-ipsec = "\ # RDEPENDS_task-base-wifi = "\ wireless-tools \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-tools', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'hostap', 'hostap-utils', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'madwifi', 'madwifi-ng-tools', '',d)} \ wpa-supplicant" RRECOMMENDS_task-base-wifi = "\ - ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-modules', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'madwifi', 'madwifi-ng-modules', '',d)} \ ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ kernel-module-ieee80211-crypt \ kernel-module-ieee80211-crypt-ccmp \ diff --git a/recipes/tasks/task-mokogateway.bb b/recipes/tasks/task-mokogateway.bb index b0214dc388..a1e0bc2b02 100644 --- a/recipes/tasks/task-mokogateway.bb +++ b/recipes/tasks/task-mokogateway.bb @@ -55,8 +55,8 @@ DESCRIPTION_task-mokogateway-wifi = "MokoGateway: WiFi" RDEPENDS_task-mokogateway-wifi = "\ bridge-utils \ wireless-tools \ - ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-modules", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-tools", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng-modules", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng-tools", "",d)} \ wpa-supplicant \ " RRECOMMENDS_task-mokogateway-wifi = "\ |