This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via de20524ed3e6aaab52bb3009c807ae3602f8e273 (commit) via 11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2 (commit) from c791bb2a5982940068bcfdfe4845d233be283aa3 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit de20524ed3e6aaab52bb3009c807ae3602f8e273 Merge: 11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2 c791bb2a5982940068bcfdfe4845d233be283aa3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 12 19:28:18 2010 +0100
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
Conflicts: config/rootfiles/core/35/filelists/files
commit 11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 11 23:48:05 2010 +0100
Add missing modules for intersil/prism (disabled) to core35.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/compat-wireless | 1 + config/rootfiles/core/35/filelists/files | 13 ++++++++++++- config/rootfiles/core/35/update.sh | 5 +++-- lfs/compat-wireless | 20 +++++++++++++++++--- 4 files changed, 33 insertions(+), 6 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless index 8b56de8..7baef23 100644 --- 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 0e5c74e..15fca78 100644 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@ -1,4 +1,15 @@ 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 srv/web/ipfire/cgi-bin/outgoingfw.cgi -var/ipfire/outgoing/bin/outgoingfw.pl \ No newline at end of file +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/core/35/update.sh b/config/rootfiles/core/35/update.sh index 377e2a1..6eaf629 100644 --- 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 2c8d137..1cdff0e 100644 --- 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) -
hooks/post-receive -- IPFire 2.x development tree