diff options
| author | Chris Larson <clarson@mvista.com> | 2009-07-10 11:27:31 -0700 |
|---|---|---|
| committer | Chris Larson <clarson@mvista.com> | 2009-08-19 13:27:05 -0700 |
| commit | aea9acb329d715db851c1bed8506c3d0f9b42ae1 (patch) | |
| tree | 64f0a214af95867585800343554be7f30803b3f6 /recipes/tasks | |
| parent | e28e9d0b52f26b078b5be4e5ea61e97852ccffac (diff) | |
Let the distro control whether we include hostap or madwifi.
- Add base_ifelse convenience function to base.bbclass.
- Replace all conditionals in the recipes relating to hostap and madwifi to
look for their name in COMBINED_FEATURES rather than looking for specific buses (pci, pcmcia).
- Change the default COMBINED_FEATURES to enable:
- madwifi, when:
- distro has pci, wifi, and madwifi in its features
- machine has pci in its features
- hostap, when:
- 'wifi' and 'hostap' are in distro features
- either 'pci' or 'pcmcia' are in both distro and machine features
Signed-off-by: Chris Larson <clarson@mvista.com>
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 = "\ |