SPECS: kernel-scsi-mv.spec - use %build_kernel_modules, %install_k...

[sparky]

Author: sparky                       Date: Thu Nov 23 22:07:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %build_kernel_modules, %install_kernel_modules
- specifu KERNEL_VER=2.6 (now builds with 2.6.18)

---- Files affected:
SPECS:
   kernel-scsi-mv.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/kernel-scsi-mv.spec
diff -u SPECS/kernel-scsi-mv.spec:1.14 SPECS/kernel-scsi-mv.spec:1.15
--- SPECS/kernel-scsi-mv.spec:1.14	Thu Nov 23 21:23:23 2006
+++ SPECS/kernel-scsi-mv.spec	Thu Nov 23 23:07:54 2006
@@ -28,9 +28,9 @@
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %{?with_dist_kernel:%requires_releq_kernel_up}
-BuildRequires:	rpmbuild(macros) >= 1.308
+BuildRequires:	rpmbuild(macros) >= 1.330
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:Requires(postun):	kernel}
+%{?with_dist_kernel:Requires(postun):	%releq_kernel_up}
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,7 +51,7 @@
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:Requires(postun):	kernel%{_alt_kernel}-smp}
+%{?with_dist_kernel:Requires(postun):	%releq_kernel_smp}
 
 %description -n kernel%{_alt_kernel}-smp-scsi-mv
 Linux SMP SATA driver for the Marvell MV88SX50xx and MV88SX60x1.
@@ -73,44 +73,12 @@
 # kernel module(s)
 cd LinuxIAL
 %{__make} link_files
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	install -d o/include/linux
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		M=$PWD O=$PWD/o \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		KERNEL_SRC="%{_kernelsrcdir}"
-		%{?with_verbose:V=1}
-	for i in mv_sata; do
-		mv $i{,-$cfg}.ko
-	done
-done
+%build_kernel_modules -m mv_sata KERNEL_VER=2.6 KERNEL_SRC="%{_kernelsrcdir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd LinuxIAL
 
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/scsi
-for i in mv_sata; do
-	install $i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/scsi/$i.ko
-done
-%if %{with smp} && %{with dist_kernel}
-for i in mv_sata; do
-	install $i-smp.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/scsi/$i.ko
-done
-%endif
+%install_kernel_modules -m LinuxIAL/mv_sata -d kernel/drivers/scsi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -130,13 +98,13 @@
 %files
 %defattr(644,root,root,755)
 %doc LinuxIAL/ReleaseNotes.txt
-/lib/modules/%{_kernel_ver}/kernel/drivers/scsi/*.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/scsi/mv_sata.ko*
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-scsi-mv
 %defattr(644,root,root,755)
 %doc LinuxIAL/ReleaseNotes.txt
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/scsi/*.ko*
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/scsi/mv_sata.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -145,6 +113,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/11/23 22:07:54  sparky
+- use %build_kernel_modules, %install_kernel_modules
+- specifu KERNEL_VER=2.6 (now builds with 2.6.18)
+
 Revision 1.14  2006/11/23 20:23:23  hawk
 - alt_kernel support (BR: rpm-build-macros >= 1.308)
 - release 10
@@ -187,4 +159,3 @@
 
 Revision 1.1  2005/08/29 20:04:26  arekm
 - initial pld release
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-scsi-mv.spec?r1=1.14&r2=1.15&f=u