diff options
| author |   Chris Larson <clarson@mvista.com> | 2009-07-10 11:27:31 -0700 |
|---|---|---|
| committer | Chris Larson <clarson@mvista.com> | 2009-07-16 12:42:17 -0700 |
| commit | ca053f148269719ae9e1f073d21c2734a02eb9ca (patch) | |
| tree | 020dd76225a46873593ea885204f1349dd65e692 /conf/bitbake.conf | |
| parent | a9b6ecec7083b91c6fca5e7397e72d61564b2aef (diff) | |
| download | openembedded-ca053f148269719ae9e1f073d21c2734a02eb9ca.tar.gz | |
Let the distro control whether we include hostap or madwifi.kergoth/hostap-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:
- 'pci', 'wifi', and 'madwifi' are in distro features
- 'pci' is in machine 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 8b6956453b..a3c475f47b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -715,3 +715,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: +# - 'pci', 'wifi', and 'madwifi' are in distro features +# - 'pci' is in machine 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', '')}" |