SPECS: kernel-misc-nforce.spec - try %build_kernel_modules, %insta...

[sparky]

Author: sparky                       Date: Fri Nov 24 00:33:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- try %build_kernel_modules, %install_kernel_modules

---- Files affected:
SPECS:
   kernel-misc-nforce.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/kernel-misc-nforce.spec
diff -u SPECS/kernel-misc-nforce.spec:1.29 SPECS/kernel-misc-nforce.spec:1.30
--- SPECS/kernel-misc-nforce.spec:1.29	Thu Nov 23 19:53:00 2006
+++ SPECS/kernel-misc-nforce.spec	Fri Nov 24 01:33:09 2006
@@ -109,58 +109,25 @@
 	-i nvnet/nvenet.c \
 	-i nvsound/main/nvmain.c
 ln -sf Makefile.kbuild Makefile
-cp nvsound/main/nvalinux.c{,.orig}
+#cp nvsound/main/nvalinux.c{,.orig}
 
-for driver in nvnet nvsound;do
-	if [ "$driver" = nvnet ]; then
-		cd nvnet
-	else
-		cd ../nvsound/main
-	fi
-	for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-		if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-			exit 1
-		fi
-		ln -sf Makefile{.kbuild,}
-
-		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 [ -r nvalinux.c.orig ]; then
-			if grep -q "^CONFIG_PREEMPT_RT=y$" o/.config; then
-				sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(global_spinlock)/' \
-					nvalinux.c.orig > nvalinux.c
-			else
-				cat nvalinux.c.orig > nvalinux.c
-			fi
-		fi
-		%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-
-		rm -f `ls *.o|grep -Ev 'mcpmain|nvenetlib'`
-		%{__make} -C %{_kernelsrcdir} modules \
-			CC="%{__cc}" CPP="%{__cpp}" \
-			M=$PWD O=$PWD/o EXTRA_CFLAGS=-DNV_REMAP_PFN_RANGE_PRESENT \
-			%{?with_verbose:V=1}
-		mv $driver.ko $driver-$cfg.ko
-	done
-done
+%build_kernel_modules -c -C nvnet -m nvnet <<'EOF'
+rm -f `ls *.o | grep -Ev 'nvenetlib'`
+EOF
+
+%build_kernel_modules -c -C nvsound/main -m nvsound EXTRA_CFLAGS=-DNV_REMAP_PFN_RANGE_PRESENT <<'EOF'
+rm -f `ls *.o | grep -Ev 'mcpmain'`
+#if grep -q "^CONFIG_PREEMPT_RT=y$" o/.config; then
+#	sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(global_spinlock)/' \
+#		nvalinux.c.orig > nvalinux.c
+#else
+#	cat nvalinux.c.orig > nvalinux.c
+#fi
+EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-
-install nvnet/nvnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvnet.ko
-install nvsound/main/nvsound-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvsound.ko
-
-%if %{with smp} && %{with dist_kernel}
-install nvnet/nvnet-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvnet.ko
-install nvsound/main/nvsound-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvsound.ko
-%endif
+%install_kernel_modules -m nvnet/nvnet,nvsound/main/nvsound -d misc
 
 cp nvnet/ReleaseNotes.html ReleaseNotes-nvnet.html
 cp nvsound/ReleaseNotes.html ReleaseNotes-nvsound.html
@@ -183,13 +150,15 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE pkg-history.txt ReleaseNotes*
-/lib/modules/%{_kernel_ver}/misc/*
+/lib/modules/%{_kernel_ver}/misc/nvnet.ko*
+/lib/modules/%{_kernel_ver}/misc/nvsound.ko*
 
 %if %{with smp}
 %files -n kernel%{_alt_kernel}-smp-misc-%{short_name}
 %defattr(644,root,root,755)
 %doc LICENSE pkg-history.txt ReleaseNotes*
-/lib/modules/%{_kernel_ver}smp/misc/*
+/lib/modules/%{_kernel_ver}smp/misc/nvnet.ko*
+/lib/modules/%{_kernel_ver}smp/misc/nvsound.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -198,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/11/24 00:33:09  sparky
+- try %build_kernel_modules, %install_kernel_modules
+
 Revision 1.29  2006/11/23 18:53:00  hawk
 - release 5
 
================================================================

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