From 9ee7b0e09abd4504c47ce5430924e3da4632532a Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 13 Mar 2009 17:08:35 +0000
Subject: task-base, wpa-supplicant-0.6 : remove madwifi as it doesnt appear to
 build and is included in modern kernels.

---
 packages/tasks/task-base.bb                     |  4 +---
 packages/wpa-supplicant/wpa-supplicant-0.6.inc  | 15 +--------------
 packages/wpa-supplicant/wpa-supplicant_0.6.7.bb |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index c60ae4ff0b..10ec5a06ab 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r79"
+PR = "r80"
 
 inherit task
 
@@ -342,11 +342,9 @@ RDEPENDS_task-base-wifi = "\
     wireless-tools \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
-    ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-tools', '',d)} \
     wpa-supplicant"
 
 RRECOMMENDS_task-base-wifi = "\
-    ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-modules', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
     kernel-module-ieee80211-crypt \
     kernel-module-ieee80211-crypt-ccmp \
diff --git a/packages/wpa-supplicant/wpa-supplicant-0.6.inc b/packages/wpa-supplicant/wpa-supplicant-0.6.inc
index aee9ced4f7..4020c2626c 100644
--- a/packages/wpa-supplicant/wpa-supplicant-0.6.inc
+++ b/packages/wpa-supplicant/wpa-supplicant-0.6.inc
@@ -2,11 +2,7 @@ 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)}"
-
-#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)}"
+DEPENDS = "dbus gnutls"
 
 DEFAULT_PREFERENCE = "-2"
 
@@ -15,8 +11,6 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://ifupdown.sh \
 	file://functions.sh"
 
-#	file://gnutlsfix.patch;patch=1 \
-
 S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
 
 PACKAGES_prepend = "wpa-supplicant-passphrase "
@@ -26,15 +20,8 @@ RREPLACES = "wpa-supplicant-cli"
 
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase"
 
-export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
-
 do_configure () {
         install -m 0755 ${WORKDIR}/defconfig-0.6.0-gnutls  .config
-
-        if [ "x$HAS_PCI" == "x1" ] ; then
-                echo "CONFIG_DRIVER_MADWIFI=y" >> .config
-                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
-        fi
 }
 
 do_compile () {
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.7.bb
index 4712d9ec26..9d9ac6852d 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.6.7.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.6.7.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.6.inc
 
-PR = "r4"
+PR = "r5"
-- 
cgit 1.2.3-korg