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

[Tobias Powalowski]

    Date: Monday, October 25, 2010 @ 17:08:01
  Author: tpowa
Revision: 97007

upgpkg: nvidia-96xx 96.43.18-2
bump to 2.6.36 kernel

Added:
  nvidia-96xx/trunk/kernel-2.6.36.patch
Modified:
  nvidia-96xx/trunk/PKGBUILD
  nvidia-96xx/trunk/nvidia.install

---------------------+
 PKGBUILD            |   20 ++++++++++++--------
 kernel-2.6.36.patch |   10 ++++++++++
 nvidia.install      |    4 ++--
 3 files changed, 24 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-10-25 21:05:29 UTC (rev 97006)
+++ PKGBUILD    2010-10-25 21:08:01 UTC (rev 97007)
@@ -3,29 +3,33 @@
 
 pkgname=nvidia-96xx
 pkgver=96.43.18
-_kernver='2.6.35-ARCH'
-pkgrel=1
+_kernver='2.6.36-ARCH'
+pkgrel=2
 pkgdesc="NVIDIA drivers for kernel26, 96xx branch."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/";
-depends=('kernel26>=2.6.35' 'kernel26<2.6.36' 'nvidia-96xx-utils')
-makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36')
+depends=('kernel26>=2.6.36' 'kernel26<2.6.37' 'nvidia-96xx-utils')
+makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37')
 conflicts=('nvidia' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
-source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run";)
-md5sums=('f19041ded11947c54ac9f31dc1496e3b')
-[ "$CARCH" = "x86_64" ] && md5sums=('10105692a6578862221a97e24267a9e4')
+source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run";
+        kernel-2.6.36.patch)
+md5sums=('f19041ded11947c54ac9f31dc1496e3b'
+         '6b505d88779c6ee0c6346241802b5e13')
 
+[ "$CARCH" = "x86_64" ] && md5sums=('10105692a6578862221a97e24267a9e4' 
'6b505d88779c6ee0c6346241802b5e13')
+
 build() {
        cd $srcdir
        sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
        cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
        cd usr/src/nv/
+        patch -Np0 -i $startdir/kernel-2.6.36.patch
        ln -s Makefile.kbuild Makefile
-       make SYSSRC=/lib/modules/${_kernver}/build module || return 1
+       make SYSSRC=/lib/modules/${_kernver}/build module
 
        mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
        install -m644 nvidia.ko 
$pkgdir/lib/modules/${_kernver}/kernel/drivers/video/

Added: kernel-2.6.36.patch
===================================================================
--- kernel-2.6.36.patch                         (rev 0)
+++ kernel-2.6.36.patch 2010-10-25 21:08:01 UTC (rev 97007)
@@ -0,0 +1,10 @@
+--- nv.c~      2010-10-25 23:03:15.976668304 +0200
++++ nv.c       2010-10-25 23:08:12.783334336 +0200
+@@ -249,7 +249,6 @@
+ static struct file_operations nv_fops = {
+     .owner     = THIS_MODULE,
+     .poll      = nv_kern_poll,
+-    .ioctl     = nv_kern_ioctl,
+ #if defined(HAVE_UNLOCKED_IOCTL)
+     .unlocked_ioctl = nv_kern_unlocked_ioctl,
+ #endif

Modified: nvidia.install
===================================================================
--- nvidia.install      2010-10-25 21:05:29 UTC (rev 97006)
+++ nvidia.install      2010-10-25 21:08:01 UTC (rev 97007)
@@ -1,5 +1,5 @@
 post_install() {
-       KERNEL_VERSION='2.6.35-ARCH'
+       KERNEL_VERSION='2.6.36-ARCH'
        depmod $KERNEL_VERSION
 }
 
@@ -9,6 +9,6 @@
 }
 
 post_remove() {
-       KERNEL_VERSION='2.6.35-ARCH'
+       KERNEL_VERSION='2.6.36-ARCH'
        depmod $KERNEL_VERSION
 }