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 /conf | |
| parent | ada6f217e946c731fbc42d831021aa1fcae28777 (diff) | |
| parent | ac729cee6058e9e601af4869874213ccd129c732 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to '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', '')}" |