Patchwork [4/5] wpa-supplicant-0.7.3: enable madwifi support

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 11, 2011, 12:57 p.m.
Message ID <1297429080-3986-4-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/539/
State Accepted
Commit 5bf221337ba5509bd11ff9553e60c42b7779c575
Headers show

Comments

Andreas Oberritter - Feb. 11, 2011, 12:57 p.m.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Stefan Schmidt - Feb. 11, 2011, 2:38 p.m.
Hello.

On Fri, 2011-02-11 at 12:57, Andreas Oberritter wrote:
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
>  recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> index ca7751c..f64eb79 100644
> --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> @@ -6,7 +6,7 @@ LICENSE = "GPLv2 | BSD"
>  LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
>                      file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
>                      file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
> -DEPENDS = "gnutls dbus libnl2"
> +DEPENDS = "gnutls dbus libnl2 ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
>  RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
>  
>  SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
> @@ -31,6 +31,10 @@ FILES_${PN} += " /usr/share/dbus-1/system-services/*"
>  
>  do_configure () {
>  	install -m 0755 ${WORKDIR}/defconfig .config
> +	if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0, d)}" = "1" ]; then
> +		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
> +		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
> +	fi
>  }

Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>

regards
Stefan Schmidt

Patch

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
index ca7751c..f64eb79 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -6,7 +6,7 @@  LICENSE = "GPLv2 | BSD"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
                     file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
                     file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
-DEPENDS = "gnutls dbus libnl2"
+DEPENDS = "gnutls dbus libnl2 ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
@@ -31,6 +31,10 @@  FILES_${PN} += " /usr/share/dbus-1/system-services/*"
 
 do_configure () {
 	install -m 0755 ${WORKDIR}/defconfig .config
+	if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0, d)}" = "1" ]; then
+		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+	fi
 }
 
 do_compile () {