SPECS: kernel-net-ieee80211.spec - modules are not in conflict wit...
blues
blues at pld-linux.org
Sat Mar 11 13:11:54 CET 2006
Author: blues Date: Sat Mar 11 12:11:54 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- modules are not in conflict with modules from kernel. release 2.
---- Files affected:
SPECS:
kernel-net-ieee80211.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SPECS/kernel-net-ieee80211.spec
diff -u SPECS/kernel-net-ieee80211.spec:1.13 SPECS/kernel-net-ieee80211.spec:1.14
--- SPECS/kernel-net-ieee80211.spec:1.13 Tue Mar 7 00:17:20 2006
+++ SPECS/kernel-net-ieee80211.spec Sat Mar 11 13:11:48 2006
@@ -14,7 +14,7 @@
Summary(pl): Moduł jądra Linuksa do stosu sieciowego ieee80211
Name: kernel-net-%{modname}
Version: 1.1.12
-%define _rel 1
+%define _rel 2
Release: %{_rel}@%{_kernel_ver_str}
License: GPL v2
Group: Base/Kernel
@@ -85,9 +85,9 @@
ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
%endif
ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
- %if %{without dist_kernel}
+# %if %{without dist_kernel}
ln -sf %{_kernelsrcdir}/scripts
- %endif
+ # %endif
touch include/config/MARKER
%{__make} -C %{_kernelsrcdir} clean \
RCS_FIND_IGNORE="-name '*.ko' -o" \
@@ -117,6 +117,18 @@
install net/* \
$RPM_BUILD_ROOT%{_kernelsrcdir}/include/net
+# avoid conflicts with kernel modules:
+cd $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+for module in *.ko; do
+ mv $module `basename $module | sed -e "s/\.ko//"`_current.ko
+done
+%if %{with smp} && %{with dist_kernel}
+cd $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
+for module in *.ko; do
+ mv $module `basename $module | sed -e "s/\.ko//"`_current.ko
+done
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -132,6 +144,32 @@
%postun -n kernel-smp-net-%{modname}
%depmod %{_kernel_ver}smp
+%triggerpostun -n kernel-net-ieee80211 -- kernel-net-ieee80211 < 1.1.12-2
+%banner kernel-net-ieee80211-1.1.12-1 <<'EOF'
+Current kernel provides ieee80211* modules.
+This package contains currently module named ieee80211*_current.
+
+If you want to use this module do:
+echo "alias ieee80211 ieee80211_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt ieee80211_crypt_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt_ccmp ieee80211_crypt_ccmp_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt_tkip ieee80211_crypt_tkip_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt_wep ieee80211_crypt_wep_current" >> /etc/modprobe.conf
+EOF
+
+%triggerpostun -n kernel-smp-net-ieee80211 -- kernel-smp-net-ieee80211 < 1.1.12-2
+%banner kernel-smp-net-ieee80211-1.1.12-1 <<'EOF'
+Current kernel provides ieee80211* modules.
+This package contains currently module named ieee80211*_current.
+
+If you want to use this module do:
+echo "alias ieee80211 ieee80211_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt ieee80211_crypt_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt_ccmp ieee80211_crypt_ccmp_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt_tkip ieee80211_crypt_tkip_current" >> /etc/modprobe.conf
+echo "alias ieee80211_crypt_wep ieee80211_crypt_wep_current" >> /etc/modprobe.conf
+EOF
+
%files -n kernel-net-%{modname}
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/ieee80211*.ko*
@@ -153,6 +191,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2006/03/11 12:11:48 blues
+- modules are not in conflict with modules from kernel. release 2.
+
Revision 1.13 2006/03/06 23:17:20 djurban
- update to 1.1.12
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-net-ieee80211.spec?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list