From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 6 Oct 2009 19:06:42 +0000 (+0200)
Subject: Fix non compat-wireless ath9k module remove
X-Git-Tag: v2.9-beta1~710
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=4d573fcc33ad658d458c14813201b88b7cc3f9e1

Fix non compat-wireless ath9k module remove
---

diff --git a/config/rootfiles/core/32/update.sh b/config/rootfiles/core/32/update.sh
index efa8c1b716..a8e7a8d93f 100644
--- a/config/rootfiles/core/32/update.sh
+++ b/config/rootfiles/core/32/update.sh
@@ -31,3 +31,12 @@ echo "17 5 * * *      /etc/init.d/tmpfs backup >/dev/null" >> /var/tmp/root.tmp
 fcrontab /var/tmp/root.tmp
 #Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#Remove some non compat-wireless modules
+rm -rf /lib/modules/2.6.27.31-ipfire/kernel/drivers/net/wireless/ath?k
+rm -rf /lib/modules/2.6.27.31-ipfire/kernel/drivers/net/wireless/rtl818?.ko
+rm -rf /lib/modules/2.6.27.31-ipfire-xen/kernel/drivers/net/wireless/ath?k
+rm -rf /lib/modules/2.6.27.31-ipfire-xen/kernel/drivers/net/wireless/rtl818?.ko
+#Rebuild module dep's
+depmod -a
+#Don't report the exitcode of depmod
+exit 0
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index e8b9ca9443..1d7c89ce99 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -69,8 +69,8 @@
 * clamav-0.95.2
 * cmake-2.4.8
 * collectd-4.5.3
-* compat-wireless-2009-06-17-kmod-2.6.27.31-ipfire
-* compat-wireless-2009-06-17-kmod-2.6.27.31-ipfire-xen
+* compat-wireless-2009-05-30-kmod-2.6.27.31-ipfire
+* compat-wireless-2009-05-30-kmod-2.6.27.31-ipfire-xen
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005
@@ -282,7 +282,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.6
 * rtorrent-0.8.4
-* samba-3.3.7
+* samba-3.3.8
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index cdc4380095..5d1bff17e2 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -118,8 +118,9 @@ endif
 	# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
 	echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
 
-	# Remove original kernel rtl818x modules (compat wireless use the
-	# place of newer kernels and so not overwrite it...
+	# Remove original kernel modules (compat wireless use the
+	# place of newer kernels and so not overwrite it...)
+	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/ath?k
 	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
 
 	-rm -rf $(DIR_APP)