From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 8 Sep 2011 18:27:51 +0000 (+0000)
Subject: Reenable hostapd and wpa_supplicant.
X-Git-Tag: v2.9-core54~13^2~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1e7669b616215329ba00c4c1cacb369e77c45c3;p=people%2Fms%2Fipfire-2.x.git

Reenable hostapd and wpa_supplicant.

Disabled support for madwifi on ARM.
---

diff --git a/lfs/hostapd b/lfs/hostapd
index 0ca035c4aa..6dca252f7e 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -82,6 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	-cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/
 	-cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/
 	cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config
+ifeq "$(MACHINE)" "arm"
+	cd $(DIR_APP)/hostapd && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config
+endif
 	cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile
 	cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP)/hostapd && make install
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index 8b25cf1966..28edbd6bee 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -75,6 +75,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config
+ifeq "$(MACHINE)" "arm"
+	cd $(DIR_APP)/wpa_supplicant && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config
+endif
 	cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile
 	cd $(DIR_APP)/wpa_supplicant && sed -e "s@/usr/local@/usr@g" -i Makefile
 	cd $(DIR_APP)/wpa_supplicant && CFLAGS+=-I/usr/src/linux/include make && make install
diff --git a/make.sh b/make.sh
index 223086676e..500fff0a99 100755
--- a/make.sh
+++ b/make.sh
@@ -666,8 +666,8 @@ buildipfire() {
   ipfiremake vnstat
   ipfiremake vnstati
   ipfiremake iw
-  #ipfiremake wpa_supplicant
-  #ipfiremake hostapd
+  ipfiremake wpa_supplicant
+  ipfiremake hostapd
   ipfiremake urlgrabber
   if [ "${MACHINE:0:3}" != "arm" ]; then
     ipfiremake syslinux