[arch-commits] Commit in nvidia-304xx/trunk (3 files)

[Evangelos Foutras]

    Date: Wednesday, February 20, 2013 @ 10:25:36
  Author: foutrelis
Revision: 178329

Use more generic patch for building against Linux 3.7.6+.

Added:
  nvidia-304xx/trunk/linux-3.7.patch
Modified:
  nvidia-304xx/trunk/PKGBUILD
Deleted:
  nvidia-304xx/trunk/linux-3.7.6.patch

-------------------+
 PKGBUILD          |   22 +++++++++-------------
 linux-3.7.6.patch |   11 -----------
 linux-3.7.patch   |   24 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-20 09:19:23 UTC (rev 178328)
+++ PKGBUILD	2013-02-20 09:25:36 UTC (rev 178329)
@@ -14,25 +14,21 @@
 license=('custom')
 install=nvidia.install
 options=(!strip)
+source=('linux-3.7.patch'
+        'uapi-3.7.patch')
+md5sums=('7c684fab691b15d55a79fd8f9b1a224d'
+         '502d00dc850148d61fc06c907601498e')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
-            'uapi-3.7.patch'
-            "linux-3.7.6.patch")
-    md5sums=('6964415cf648a5f4f38117b168369de2'
-             '502d00dc850148d61fc06c907601498e'
-             '2627107ebbd930389b00a9a2cd5e6f42')
+    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums+=('6964415cf648a5f4f38117b168369de2')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
    _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
-            'uapi-3.7.patch'
-            "linux-3.7.6.patch")
-    md5sums=('76007ed4b72afd334e26377b646f5f7e'
-             '502d00dc850148d61fc06c907601498e'
-             '2627107ebbd930389b00a9a2cd5e6f42')
+    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums+=('76007ed4b72afd334e26377b646f5f7e')
 fi
 
 build() {
@@ -41,7 +37,7 @@
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}/kernel"
     patch -Np0 -i "${srcdir}/uapi-3.7.patch"
-    patch -Np3 -i "${srcdir}"/linux-3.7.6.patch
+    patch -Np3 -i "${srcdir}/linux-3.7.patch"
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 

Deleted: linux-3.7.6.patch
===================================================================
--- linux-3.7.6.patch	2013-02-20 09:19:23 UTC (rev 178328)
+++ linux-3.7.6.patch	2013-02-20 09:25:36 UTC (rev 178329)
@@ -1,11 +0,0 @@
---- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:20.669633666 -0500
-+++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:34.283334673 -0500
-@@ -1701,7 +1701,7 @@
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
-                 if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
--                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-+                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi

Added: linux-3.7.patch
===================================================================
--- linux-3.7.patch	                        (rev 0)
+++ linux-3.7.patch	2013-02-20 09:25:36 UTC (rev 178329)
@@ -0,0 +1,24 @@
+the nvidia drivers are trying to test for version 2.6.6, but fail to take into
+account the first digit.  so 3.7.0+ ends up failing the test.
+
+https://bugs.gentoo.org/447566
+
+--- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:20.669633666 -0500
++++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:34.283334673 -0500
+@@ -1697,13 +1697,15 @@
+                 # kernel older than 2.6.6, that's all we require to
+                 # build the module.
+                 #
++                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
+                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
+                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
+ 
+-                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
++                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
++                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
+                     SELECTED_MAKEFILE=Makefile.kbuild
+                     RET=0
+                 fi
+             fi
+         fi