SPECS: kernel-usb-usbvision.spec - use new build_kernel_modules ma...

[shadzik]

Author: shadzik                      Date: Wed Nov 29 02:29:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new build_kernel_modules macros

---- Files affected:
SPECS:
   kernel-usb-usbvision.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/kernel-usb-usbvision.spec
diff -u SPECS/kernel-usb-usbvision.spec:1.6 SPECS/kernel-usb-usbvision.spec:1.7
--- SPECS/kernel-usb-usbvision.spec:1.6	Wed Sep  6 15:48:33 2006
+++ SPECS/kernel-usb-usbvision.spec	Wed Nov 29 03:29:07 2006
@@ -20,7 +20,7 @@
 # Source0-md5:	46f8067489bacf4c1759416cedf84405
 URL:		http://usbvision.sourceforge.net/
 %{?with_dist_kernel:BuildRequires:	kernel-source >= 2.6.0}
-BuildRequires:	rpmbuild(macros) >= 1.118
+BuildRequires:	rpmbuild(macros) >= 1.330
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 ExclusiveArch:	%{ix86}
@@ -72,63 +72,11 @@
 %setup -q -n usbvision
 
 %build
-cd src
-%if %{with kernel}
-# kernel module(s)
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	install -d $cfg
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	rm -rf o
-	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
-%if %{with dist_kernel}
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-	install -d o/include/config
-	touch o/include/config/MARKER
-#	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
-
-#
-#	patching/creating makefile(s) (optional)
-#
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		CONFIG_MODULES=y \
-		CONFIG_NET_RADIO=y \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		CONFIG_MODULES=y \
-		CONFIG_NET_RADIO=y \
-		%{?with_verbose:V=1}
-
-	mv *.ko $cfg
-done
-%endif
+%build_kernel_modules -m usbvision,i2c-algo-usb -C src
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/usb/media
-
-%if %{with kernel}
-install src/%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/*.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/usb/media
-%if %{with smp} && %{with dist_kernel}
-install src/smp/*.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/media
-%endif
-%endif
+%install_kernel_modules -m src/usbvision,src/i2c-algo-usb -d kernel/drivers/usb/media
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -165,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/29 02:29:07  shadzik
+- use new build_kernel_modules macros
+
 Revision 1.6  2006/09/06 13:48:33  sparky
 - mass atack: -j1 for make scripts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-usb-usbvision.spec?r1=1.6&r2=1.7&f=u