hostap-daemon and madwifi: fix compatibility problems on mtx platforms

* added mtx-2 configuration to hostapd-daemon
* made madwifi-modules_cvs the default choice (the bsd branch has been abandoned)
* made sure that madwifi_modules stages the headers correctly so that hostap-daemon compiles on mtx/nylon

6 files changed, 90 insertions, 5 deletions

diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc
index 83491bfb14..a6e4a6246d 100644
--- a/packages/hostap/hostap-daemon.inc
+++ b/packages/hostap/hostap-daemon.inc
@@ -7,6 +7,9 @@ LICENSE = "GPL"
 RDEPENDS = "hostap-modules hostap-utils (${PV})"
 DEPENDS = "openssl"
 DEPENDS_mtx-1_append = "madwifi-modules"
+DEPENDS_mtx-2_append = "madwifi-modules"
+CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/"
+CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
 	file://makefile-cross.diff;patch=1;pnum=0 \
diff --git a/packages/hostap/hostap-daemon/mtx-2/.mtn2git_empty b/packages/hostap/hostap-daemon/mtx-2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hostap/hostap-daemon/mtx-2/.mtn2git_empty
diff --git a/packages/hostap/hostap-daemon/mtx-2/defconfig b/packages/hostap/hostap-daemon/mtx-2/defconfig
new file mode 100644
index 0000000000..8c3065c3b9
--- /dev/null
+++ b/packages/hostap/hostap-daemon/mtx-2/defconfig
@@ -0,0 +1,66 @@
+# Example hostapd build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for wired authenticator
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for madwifi driver
+CONFIG_DRIVER_MADWIFI=y
+#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src
+
+# Driver interface for Prism54 driver
+CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# IEEE 802.11F/IAPP
+CONFIG_IAPP=y
+
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
+# Integrated EAP authenticator
+CONFIG_EAP=y
+
+# EAP-MD5 for the integrated EAP authenticator
+CONFIG_EAP_MD5=y
+
+# EAP-TLS for the integrated EAP authenticator
+CONFIG_EAP_TLS=y
+
+# EAP-MSCHAPv2 for the integrated EAP authenticator
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-PEAP for the integrated EAP authenticator
+CONFIG_EAP_PEAP=y
+
+# EAP-GTC for the integrated EAP authenticator
+CONFIG_EAP_GTC=y
+
+# EAP-TTLS for the integrated EAP authenticator
+CONFIG_EAP_TTLS=y
+
+# EAP-SIM for the integrated EAP authenticator
+#CONFIG_EAP_SIM=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# RADIUS authentication server. This provides access to the integrated EAP
+# authenticator from external hosts using RADIUS.
+CONFIG_RADIUS_SERVER=y
diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc
index 5ce5e0db67..4d1cc76d32 100644
--- a/packages/hostap/hostap-modules.inc
+++ b/packages/hostap/hostap-modules.inc
@@ -8,6 +8,8 @@ SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz"
 
 SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
 	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_mtx-2 = " file://mtx_compat.diff;patch=1;pnum=0 \
+	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
 
 SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
 
diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb
index 6da2c34baf..be6de0663f 100644
--- a/packages/madwifi/madwifi-modules_cvs-bsd.bb
+++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb
@@ -5,7 +5,8 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
-PV = "1:0.0+cvs${SRCDATE}-bsd"
+PV = "1.0.0+cvs${SRCDATE}-bsd"
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${SRCDATE}"
 
@@ -16,6 +17,7 @@ inherit module-base
 # Hack Alert :D
 ARCH_mipsel = "mips"
 EXTRA_OEMAKE_mtx-1 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \
+EXTRA_OEMAKE_mtx-2 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \
 COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -DATH_PCI'"
 
 do_compile() {
diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb
index 0bef3d506e..bc89d84a15 100644
--- a/packages/madwifi/madwifi-modules_cvs.bb
+++ b/packages/madwifi/madwifi-modules_cvs.bb
@@ -5,9 +5,10 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
-PV = "1:0.0+cvs${SRCDATE}"
+SRCDATE = "20050803"
+PV = "1.0.0+cvs${SRCDATE}"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;date=${SRCDATE}"
 
 S = "${WORKDIR}/madwifi"
 
@@ -17,6 +18,8 @@ inherit module-base
 ARCH_mipsel = "mips"
 EXTRA_OEMAKE_mtx-1 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \
 COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -DATH_PCI'"
+EXTRA_OEMAKE_mtx-2 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \
+COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -DATH_PCI'"
 
 do_compile() {
 	oe_runmake
@@ -25,10 +28,19 @@ do_compile() {
 
 do_install() {
 	oe_runmake DESTDIR=${D} install
-	install -d ${D}${sbindir}
+	install -d ${D}/${sbindir}
 	cd tools; 
 	oe_runmake DESTDIR=${D} BINDIR=${sbindir} install
-	install -m 755 athchans athctrl athkey ${D}${sbindir}
+	install -m 755 athchans athctrl athkey ${D}/${sbindir}
+}
+
+do_stage() {
+	# hostapd and wpa_supplicant need these files
+	install -d ${STAGING_INCDIR}/madwifi/net80211/ ${STAGING_INCDIR}/madwifi/include
+	install -m 0644 net80211/*.h ${STAGING_INCDIR}/madwifi/net80211/
+	install -m 0644 include/compat.h ${STAGING_INCDIR}/madwifi/include/
+	cd ${STAGING_INCDIR}/madwifi/net80211/
+	ln -s ../include/compat.h .
 }
 
 pkg_postinst() {