Reenable hostapd and wpa_supplicant.

Disabled support for madwifi on ARM.

diff --git a/lfs/hostapd b/lfs/hostapd
index 0ca035c4aade9d9ab7e54f921287347c79277d3f..6dca252f7e100cadc607d4fe0cb210fa0f70ea36 100644 (file)
--- 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 8b25cf19667590459516305fed036a5b6036cd74..28edbd6bee6bb4077e18dfcfeb49dc12376811c6 100644 (file)
--- 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 223086676e70dad9a9ce8d4ccddb31a799dec0c3..500fff0a99fc0e05284129f863fca054aea63511 100755 (executable)
--- 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