SPECS: slmodem.spec - upgraded %install to new kernel module build...

shadzik shadzik at pld-linux.org
Fri May 5 17:42:24 CEST 2006


Author: shadzik                      Date: Fri May  5 15:42:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- upgraded %install to new kernel module building way

---- Files affected:
SPECS:
   slmodem.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/slmodem.spec
diff -u SPECS/slmodem.spec:1.22 SPECS/slmodem.spec:1.23
--- SPECS/slmodem.spec:1.22	Fri May  5 15:44:56 2006
+++ SPECS/slmodem.spec	Fri May  5 17:42:19 2006
@@ -191,21 +191,12 @@
 %endif
 
 %if %{with kernel}
-%if %{without dist_kernel}
-for mod in *-nondist.ko; do
-	nmod=$(echo "$mod" | sed -e 's#-nondist##g')
-	install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$nmod
-done
-%else
-for mod in *-up.ko; do
-	nmod=$(echo "$mod" | sed -e 's#-up##g')
-	install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$nmod
-done
-%if %{with smp}
-for mod in *-smp.ko; do
-	nmod=$(echo "$mod" | sed -e 's#-smp##g')
-	install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/$nmod
-done
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
+install drivers/*-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+                $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/*.ko
+%if %{with smp} && %{with dist_kernel}
+install drivers/*-smp.ko \
+                $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/*.ko
 %endif
 %endif
 
@@ -282,6 +273,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/05/05 15:42:19  shadzik
+- upgraded %install to new kernel module building way
+
 Revision 1.22  2006/05/05 13:44:56  shadzik
 - new way of kernel module building; build fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/slmodem.spec?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list