rpms/nvidia-kmod/devel 3.7_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.109, 1.110

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4437

Modified Files:
	nvidia-kmod.spec 
Added Files:
	3.7_kernel.patch 
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:310.14-2
- add patch for 3.7rc kernel


3.7_kernel.patch:
 conftest.sh |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE 3.7_kernel.patch ---
--- a/nvidiapkg-x64/kernel/conftest.sh
+++ b/nvidiapkg-x64/kernel/conftest.sh
@@ -20,6 +20,7 @@
 ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
 SOURCES=$4
 HEADERS=$SOURCES/include
+HEADERSA=$SOURCES/include/uapi
 OUTPUT=$5
 XEN_PRESENT=1
 
@@ -118,7 +119,7 @@
         fi
     fi
 
-    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
 
     test_xen
 
@@ -146,10 +147,10 @@
         fi
     fi
 
-    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
 
     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
     elif [ "$ARCH" = "arm" ]; then
         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
     fi


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- nvidia-kmod.spec	16 Oct 2012 21:38:05 -0000	1.109
+++ nvidia-kmod.spec	16 Oct 2012 21:47:22 -0000	1.110
@@ -9,7 +9,7 @@
 Epoch:         1
 Version:       310.14
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -25,6 +25,8 @@
 
 Source11:       nvidia-kmodtool-excludekernel-filterfile
 
+Patch0:         3.7_kernel.patch
+
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,7 +53,7 @@
 for arch in x86 x64
 do
 pushd nvidiapkg-${arch}
- echo "NoPatch"
+%patch0 -p2
 popd
 done
 
@@ -85,6 +87,9 @@
 
 
 %changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:310.14-2
+- add patch for 3.7rc kernel
+
 * Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:310.14-1
 - Update to 310.14