aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-07-10 11:27:31 -0700
committerChris Larson <clarson@mvista.com>2009-07-16 12:42:17 -0700
commitca053f148269719ae9e1f073d21c2734a02eb9ca (patch)
tree020dd76225a46873593ea885204f1349dd65e692 /recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb
parenta9b6ecec7083b91c6fca5e7397e72d61564b2aef (diff)
downloadopenembedded-kergoth/hostap-madwifi.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 'recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb')
-rw-r--r--recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb b/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb
index 14186db40c..6ba2e995f1 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb
+++ b/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
SECTION = "network"
LICENSE = "GPL"
HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
-DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
-PR = "r1"
+PR = "r1.1"
#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
MY_ARCH := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'madwifi', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
file://defconfig-gnutls \
@@ -24,12 +24,12 @@ RREPLACES = "wpa-supplicant-cli"
RRECOMMENDS_${PN} = "wpa-supplicant-passphrase"
-export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+export HAS_MADWIFI = "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0,d)}"
do_configure () {
install -m 0755 ${WORKDIR}/defconfig-gnutls .config
- if [ "x$HAS_PCI" == "x1" ] ; then
+ if [ "x$HAS_MADWIFI" == "x1" ] ; then
echo "CONFIG_DRIVER_MADWIFI=y" >> .config
echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
fi