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 /conf/bitbake.conf | |
| 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 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 37b17d6ccf..c4af34e8d7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -716,3 +716,22 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" + +# We want madwifi if all of the following are true: +# - distro has pci, wifi, and madwifi in its features +# - machine has pci in its features +COMBINED_FEATURES += "${@base_ifelse( \ + base_contains('DISTRO_FEATURES', ('pci', 'wifi', 'madwifi'), True, False, d) and \ + base_contains('MACHINE_FEATURES', 'pci', True, False, d), \ + 'madwifi', '')}" + +# We want hostap if all of the following are true: +# - 'wifi' and 'hostap' are in distro features +# - either 'pci' or 'pcmcia' are in both distro and machine features +COMBINED_FEATURES += "${@base_ifelse( \ + base_contains('DISTRO_FEATURES', ('wifi', 'hostap'), True, False, d) and \ + ((base_contains('MACHINE_FEATURES', 'pci', True, False, d) and \ + base_contains('DISTRO_FEATURES', 'pci', True, False, d)) or \ + (base_contains('MACHINE_FEATURES', 'pcmcia', True, False, d) and \ + base_contains('DISTRO_FEATURES', 'pcmcia', True, False, d))), \ + 'hostap', '')}" |