extra hd: fix mountpoint check.

[people/pmueller/ipfire-2.x.git] / lfs / madwifi

diff --git a/lfs/madwifi b/lfs/madwifi
index 8f0ff0a3a77b580502a09060fd2e9f5f67cb52c3..90f1a1c67ed7a0d8233633db864ccaeb2d7a212a 100644 (file)
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,18 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+       VERSUFIX=ipfire-pae
+else
+
 ifeq "$(XEN)" "1"
        VERSUFIX=ipfire-xen
 else
        VERSUFIX=ipfire
 endif
+endif
 
-VER        = hal-0.10.5.6-r4031-20090529
+VER        = hal-0.10.5.6-r4119-20100201
 
 THISAPP    = madwifi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -46,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = af13564a45bb6fbb1d8834ed528a0a59
+$(DL_FILE)_MD5 = 937cf8f185ddd39b95e7ce026f9fba63
 
 install : $(TARGET)
 
@@ -86,8 +91,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # are not detected without cc but others doesn't like this
        echo '#options ath_pci countrycode=276' > /etc/modprobe.d/madwifi
        # Blacklist ath5k or madwifi for switching between the drivers
-       echo '#blacklist ath_pci' >> /etc/modprobe.d/madwifi
-       echo 'blacklist ath5k' >> /etc/modprobe.d/madwifi
+       echo 'blacklist ath_pci' >> /etc/modprobe.d/madwifi
+       echo '#blacklist ath5k' >> /etc/modprobe.d/madwifi
+       echo '#blacklist ath9k' >> /etc/modprobe.d/madwifi
 
        # create madwifi symlink for hostapd build
        cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi