SPECS: kernel-misc-nforce.spec - changed -DREMAP_NEW to -DNV_REMAP...

[sparky]

Author: sparky                       Date: Thu Apr 20 20:56:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- changed -DREMAP_NEW to -DNV_REMAP_PFN_RANGE_PRESENT for 2.6.14 and newer
  kernels
- preempt-rt patch
- rel 3

---- Files affected:
SPECS:
   kernel-misc-nforce.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/kernel-misc-nforce.spec
diff -u SPECS/kernel-misc-nforce.spec:1.22 SPECS/kernel-misc-nforce.spec:1.23
--- SPECS/kernel-misc-nforce.spec:1.22	Wed Apr 12 14:15:40 2006
+++ SPECS/kernel-misc-nforce.spec	Thu Apr 20 22:56:14 2006
@@ -11,7 +11,7 @@
 %define ver2	0310
 %define pkg	pkg1
 
-%define	_rel	2
+%define	_rel	3
 Summary:	Linux nForce driver
 Summary(pl):	Linuksowy sterownik do nForce
 Name:		kernel-misc-%{short_name}
@@ -25,7 +25,7 @@
 # Source1-md5:	52295218f89f5338b88ceb40f34eb3a3
 URL:		http://www.nvidia.com/object/linux.html
 BuildRequires:	%{kgcc_package}
-%{!?without_dist_kernel:BuildRequires:	kernel-module-build}
+%{!?without_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
 BuildRequires:	rpmbuild(macros) >= 1.213
 %{!?without_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
@@ -101,6 +101,7 @@
 
 %build
 ln -sf Makefile.kbuild Makefile
+cp nvsound/main/nvalinux.c{,.orig}
 
 for driver in nvnet nvsound;do
 	if [ "$driver" = nvnet ]; then
@@ -118,12 +119,20 @@
 		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} -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=-DREMAP_NEW \
+			M=$PWD O=$PWD/o EXTRA_CFLAGS=-DNV_REMAP_PFN_RANGE_PRESENT \
 			%{?with_verbose:V=1}
 		mv $driver.ko $driver-$cfg.ko
 	done
@@ -181,6 +190,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/04/20 20:56:14  sparky
+- changed -DREMAP_NEW to -DNV_REMAP_PFN_RANGE_PRESENT for 2.6.14 and newer
+  kernels
+- preempt-rt patch
+- rel 3
+
 Revision 1.22  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

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