Add missing modules for intersil/prism (disabled) to core35.

diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless
index 8b56de89310f484331f673eaf4da423c1123276a..7baef2350581a0c8ac8cad9c3f20f4f35ee99ad2 100644 (file)
--- a/config/rootfiles/common/compat-wireless
+++ b/config/rootfiles/common/compat-wireless
@@ -1 +1,2 @@
 etc/modprobe.d/cfg80211
+etc/modprobe.d/hostap

diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files
index 955ed678f70e28883a8353e958e53358e8b55f2c..761f4f56105d89882ec44fb8dcbfd6b11ea35bac 100644 (file)
--- a/config/rootfiles/core/35/filelists/files
+++ b/config/rootfiles/core/35/filelists/files
@@ -1,2 +1,13 @@
 etc/system-release
 srv/web/ipfire/cgi-bin/country.cgi
+etc/modprobe.d/hostap
+lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211.off
+lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt.off
+lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_ccmp.off
+lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_tkip.off
+lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_wep.off
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211.off
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt.off
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_ccmp.off
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.off
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off

diff --git a/config/rootfiles/core/35/update.sh b/config/rootfiles/core/35/update.sh
index 377e2a18e8553176991533ec99afdc5734c74e6c..6eaf629d53e42c87a3d52f9ee6093c47af46574b 100644 (file)
--- a/config/rootfiles/core/35/update.sh
+++ b/config/rootfiles/core/35/update.sh
@@ -37,8 +37,9 @@ extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 #
-#Run depmod -a to rebuld module informations
-depmod -a
+#Run depmod to rebuld module informations
+depmod 2.6.27.42-ipfire
+depmod 2.6.27.42-ipfire-xen
 #Finish
 #Don't report the exitcode last command
 exit 0

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 2c8d137b7ebdd60bfe8d86f2cb416917b587e14d..1cdff0ea127f787eaf567f1781436b5fb995857a 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -86,9 +86,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
        echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
 
-       # Remove ieee80211 modules. Because the conflicts with compat-wireless
-       -rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211
+       # Rename ieee80211 modules Because the conflicts with compat-wireless
+       -cd /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211 && rename .ko .off *
+
+       echo # If you want to use hostap (prism drivers) > /etc/modprobe.d/hostap
+       echo # you must rename the ieee80211 modules. Run: >> /etc/modprobe.d/hostap
+       echo # cd /lib/modules/$(uname -r)/kernel/net/ieee80211 && rename .off .ko >> /etc/modprobe.d/hostap
+       echo # depmod -a >> /etc/modprobe.d/hostap
+       echo >> /etc/modprobe.d/hostap
+       echo # additional you need to blacklist the orinoco modules >> /etc/modprobe.d/hostap
+       echo # by uncommenting following lines >> /etc/modprobe.d/hostap
+       echo >> /etc/modprobe.d/hostap
+       echo #blacklist orinoco >> /etc/modprobe.d/hostap
+       echo #blacklist orinoco_cs >> /etc/modprobe.d/hostap
+       echo #blacklist orinoco_plx >> /etc/modprobe.d/hostap
+       echo #blacklist orinoco_pci >> /etc/modprobe.d/hostap
+       echo #blacklist orinoco_tmd >> /etc/modprobe.d/hostap
+       echo #blacklist orinoco_nortel >> /etc/modprobe.d/hostap
 
        -rm -rf $(DIR_APP)
        @$(POSTBUILD)
-