From ca053f148269719ae9e1f073d21c2734a02eb9ca Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 10 Jul 2009 11:27:31 -0700 Subject: 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: - '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 --- recipes/wpa-supplicant/wpa-supplicant-0.6.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes/wpa-supplicant/wpa-supplicant-0.6.inc') diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc index aee9ced4f7..a31207f513 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc +++ b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc @@ -2,11 +2,11 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." SECTION = "network" LICENSE = "GPL" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "dbus gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +DEPENDS = "dbug gnutls ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" #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)}" DEFAULT_PREFERENCE = "-2" @@ -26,12 +26,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-0.6.0-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 -- cgit 1.2.3-korg