[pkg-nvidia-devel] Bug#573326: nvidia-graphics-drivers-legacy-173xx: patch to allow building with kernel 2.6.33

[Marc Haber]

Package: nvidia-graphics-drivers-legacy-173xx
Version: 173.14.22-1
Severity: wishlist
Tags: patch

Hi,

the attached patch (dumped into patches/) is needed to have
nvidia-graphics-drivers-legacy-173xx build with kernel 2.6.33. Of
course, it is necessary to enable the patch code in debian/rules as
well.

Greetings
Marc
-------------- next part --------------
--- usr/src/nv/conftest.sh	2009-11-09 07:00:14.000000000 +0100
+++ usr/src/nv/conftest.sh	2010-03-10 09:46:28.000000000 +0100
@@ -32,14 +32,14 @@
     # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
     # the kernel as a stand-alone kernel.
     #
-    FILE="linux/autoconf.h"
+    FILE="generated/autoconf.h"
 
     if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
         #
         # We are looking at a configured source tree; verify
         # that it's not a Xen kernel.
         #
-        echo "#include <linux/autoconf.h>
+        echo "#include <generated/autoconf.h>
         #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
         #error CONFIG_XEN defined!
         #endif
@@ -111,7 +111,7 @@
     fi
 }
 
-CONFTEST_PREAMBLE="#include <linux/autoconf.h>
+CONFTEST_PREAMBLE="#include <generated/autoconf.h>
     #if defined(CONFIG_XEN) && \
         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
@@ -1346,7 +1346,7 @@
         #
         RET=1
         VERBOSE=$6
-        FILE="linux/autoconf.h"
+        FILE="generated/autoconf.h"
 
         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
             #
@@ -1400,7 +1400,7 @@
         #
         RET=1
         VERBOSE=$6
-        FILE="linux/autoconf.h"
+        FILE="generated/autoconf.h"
 
         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
             #
--- usr/src/nv/nv-linux.h	2009-11-09 07:00:13.000000000 +0100
+++ usr/src/nv/nv-linux.h	2010-03-10 09:45:34.000000000 +0100
@@ -14,7 +14,7 @@
 
 #include "nv.h"
 
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/version.h>
 #include <linux/utsname.h>