SPECS: softmac.spec - mode modules to sm_ieee80211 subdir - add mo...

[sparky]

Author: sparky                       Date: Sat Jan 21 18:14:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- mode modules to sm_ieee80211 subdir
- add modprobe config

---- Files affected:
SPECS:
   softmac.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/softmac.spec
diff -u SPECS/softmac.spec:1.4 SPECS/softmac.spec:1.5
--- SPECS/softmac.spec:1.4	Fri Jan 20 19:31:28 2006
+++ SPECS/softmac.spec	Sat Jan 21 19:14:32 2006
@@ -148,24 +148,29 @@
 cd net/ieee80211
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/net
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}{,smp}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/net/sm_ieee80211
 
-for MOD in ieee80211_crypt_ccmp ieee80211_crypt_tkip \
-	ieee80211 ieee80211_crypt ieee80211_crypt_wep; do
-install $MOD-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/sm_$MOD.ko
+for MOD in ieee80211 ieee80211_crypt ieee80211_crypt_wep	\
+		ieee80211_crypt_ccmp ieee80211_crypt_tkip; do
+	install $MOD-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/sm_ieee80211/sm_$MOD.ko
+	echo "alias $MOD sm_$MOD" \
+		>> $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}/softmac.conf
 done
 install softmac/ieee80211softmac-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ieee80211softmac.ko
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/sm_ieee80211/ieee80211softmac.ko
 
 %if %{with smp} && %{with dist_kernel}
-for MOD in ieee80211_crypt_ccmp ieee80211_crypt_tkip \
-	ieee80211 ieee80211_crypt ieee80211_crypt_wep; do
-install $MOD-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/sm_$MOD.ko
+for MOD in ieee80211 ieee80211_crypt ieee80211_crypt_wep	\
+		ieee80211_crypt_ccmp ieee80211_crypt_tkip; do
+	install $MOD-smp.ko \
+		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/sm_ieee80211/sm_$MOD.ko
+	echo "alias $MOD sm_$MOD" \
+		>> $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/softmac.conf
 done
 install softmac/ieee80211softmac-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ieee80211softmac.ko
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/sm_ieee80211/ieee80211softmac.ko
 %endif
 %endif
 
@@ -200,12 +205,16 @@
 %if %{with kernel}
 %files -n kernel-net-softmac
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/net/*.ko*
+%dir /lib/modules/%{_kernel_ver}/kernel/net/sm_ieee80211
+/lib/modules/%{_kernel_ver}/kernel/net/sm_ieee80211/*.ko*
+%{_sysconfdir}/modprobe.d/%{_kernel_ver}/softmac.conf
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-softmac
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/net/*.ko*
+%dir /lib/modules/%{_kernel_ver}smp/kernel/net/sm_ieee80211
+/lib/modules/%{_kernel_ver}smp/kernel/net/sm_ieee80211/*.ko*
+%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/softmac.conf
 %endif
 %endif
 
@@ -215,6 +224,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/01/21 18:14:32  sparky
+- mode modules to sm_ieee80211 subdir
+- add modprobe config
+
 Revision 1.4  2006/01/20 18:31:28  sparky
 - add and package softmac-symvers.add which may be required by modules using it
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/softmac.spec?r1=1.4&r2=1.5&f=u