← Back to branch summary

~ubuntu-branches/ubuntu/precise/nvidia-graphics-drivers-340-updates/precise-updates

« back to all changes in this revision

Viewing changes to debian/dkms_nvidia/patches/make-use-of-the-new-uapi-framework.patch

  • Committer: Package Import Robot
  • Author(s): Alberto Milone
  • Date: 2015-08-27 16:59:02 UTC
  • Revision ID: package-import@ubuntu.com-20150827165902-je7xc80q6s7yttng
Tags: 340.93-0ubuntu0.0.0.1
https://launchpad.net/bugs/1489391
* Initial release (replaces nvidia-graphics-drivers-331-updates).
* SECURITY UPDATE:
  - CVE-2015-5950 (LP: #1489391).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/dkms_nvidia/patches/make-use-of-the-new-uapi-framework.patch
 
1
From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
 
2
From: Alberto Milone <alberto.milone@canonical.com>
 
3
Date: Wed, 7 Nov 2012 12:03:46 +0100
 
4
Subject: [PATCH 1/2] Make use of the new uapi framework
 
5
 
 
6
---
 
7
 conftest.sh |    7 ++++---
 
8
 1 file changed, 4 insertions(+), 3 deletions(-)
 
9
 
 
10
diff --git a/conftest.sh b/conftest.sh
 
11
index 388e268..8eff4d7 100755
 
12
--- a/conftest.sh
 
13
+++ b/conftest.sh
 
14
@@ -20,6 +20,7 @@ ARCH=$3
 
15
 ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
 
16
 SOURCES=$4
 
17
 HEADERS=$SOURCES/include
 
18
+HEADERSA=$SOURCES/include/uapi
 
19
 OUTPUT=$5
 
20
 XEN_PRESENT=1
 
21
 
 
22
@@ -118,7 +119,7 @@ build_cflags() {
 
23
         fi
 
24
     fi
 
25
 
 
26
-    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
 
27
+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
 
28
 
 
29
     test_xen
 
30
 
 
31
@@ -146,10 +147,10 @@ build_cflags() {
 
32
         fi
 
33
     fi
 
34
 
 
35
-    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
 
36
+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
 
37
 
 
38
     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
 
39
-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
 
40
+        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"
 
41
     elif [ "$ARCH" = "arm" ]; then
 
42
         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
 
43
     fi
 
44
-- 
 
45
1.7.9.5
 
46