SPECS: ipw3945.spec - fix smp-only build - fix modprobe file on smp

sparky sparky at pld-linux.org
Sun Feb 25 12:25:17 CET 2007


Author: sparky                       Date: Sun Feb 25 11:25:17 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix smp-only build
- fix modprobe file on smp

---- Files affected:
SPECS:
   ipw3945.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/ipw3945.spec
diff -u SPECS/ipw3945.spec:1.29 SPECS/ipw3945.spec:1.30
--- SPECS/ipw3945.spec:1.29	Mon Feb 12 23:09:10 2007
+++ SPECS/ipw3945.spec	Sun Feb 25 12:25:12 2007
@@ -2,8 +2,8 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	smp		# don't build SMP module
 %bcond_without	up		# don't build UP module
+%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_rel		1
@@ -122,16 +122,18 @@
 %postun	-n kernel%{_alt_kernel}-smp-net-%{name}
 %depmod %{_kernel_ver}smp
 
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/ipw3945-%{_mod_suffix}.ko*
 %{_sysconfdir}/modprobe.d/%{_kernel_ver}/ipw3945.conf
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/ipw3945-%{_mod_suffix}.ko*
-%{_sysconfdir}/modprobe.d/%{_kernel_ver}/ipw3945.conf
+%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/ipw3945.conf
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -140,6 +142,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2007/02/25 11:25:12  sparky
+- fix smp-only build
+- fix modprobe file on smp
+
 Revision 1.29  2007/02/12 22:09:10  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ipw3945.spec?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list