aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/hostap
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-07-10 11:27:31 -0700
committerChris Larson <clarson@mvista.com>2009-08-19 13:27:05 -0700
commitaea9acb329d715db851c1bed8506c3d0f9b42ae1 (patch)
tree64f0a214af95867585800343554be7f30803b3f6 /recipes/hostap
parente28e9d0b52f26b078b5be4e5ea61e97852ccffac (diff)
downloadopenembedded-aea9acb329d715db851c1bed8506c3d0f9b42ae1.tar.gz
openembedded-aea9acb329d715db851c1bed8506c3d0f9b42ae1.tar.bz2
openembedded-aea9acb329d715db851c1bed8506c3d0f9b42ae1.zip
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 'recipes/hostap')
-rw-r--r--recipes/hostap/hostap-daemon_0.5.10.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb
index ea493017fe..10eea40336 100644
--- a/recipes/hostap/hostap-daemon_0.5.10.bb
+++ b/recipes/hostap/hostap-daemon_0.5.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://hostap.epitest.fi"
SECTION = "kernel/userland"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
PR = "r1"
DEPENDS_append_mtx-1 = " madwifi-modules"
DEPENDS_append_mtx-2 = " madwifi-modules"
@@ -12,7 +12,7 @@ CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/"
#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/hostapd-${PV}.tar.gz \
file://makefile-cross.diff;patch=1 \
@@ -21,14 +21,14 @@ SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
S = "${WORKDIR}/hostapd-${PV}"
-export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+export HAS_MADWIFI = "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0,d)}"
inherit update-rc.d
INITSCRIPT_NAME=hostapd
do_configure() {
install -m 0644 ${WORKDIR}/defconfig ${S}/.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