diff options
| -rw-r--r-- | abs/core/nvidia-173xx/PKGBUILD | 14 | ||||
| -rw-r--r-- | abs/core/nvidia-173xx/nvidia.install | 4 | ||||
| -rw-r--r-- | abs/core/nvidia-96xx/PKGBUILD | 23 | ||||
| -rw-r--r-- | abs/core/nvidia-96xx/kernel-2.6.36.patch | 10 | ||||
| -rw-r--r-- | abs/core/nvidia-96xx/nvidia.install | 4 |
5 files changed, 33 insertions, 22 deletions
diff --git a/abs/core/nvidia-173xx/PKGBUILD b/abs/core/nvidia-173xx/PKGBUILD index 83d4b8d..46145dd 100644 --- a/abs/core/nvidia-173xx/PKGBUILD +++ b/abs/core/nvidia-173xx/PKGBUILD @@ -2,22 +2,22 @@ # Maintainer : Thomas Baechler <thomas@archlinux.org> pkgname=nvidia-173xx -pkgver=173.14.27 -_kernver='2.6.34-LinHES' -pkgrel=1 +pkgver=173.14.28 +_kernver='2.6.37-LinHES' +pkgrel=3 pkgdesc="NVIDIA drivers for kernel26, 173xx branch." arch=('i686' 'x86_64') [ "$CARCH" = "i686" ] && ARCH=x86 [ "$CARCH" = "x86_64" ] && ARCH=x86_64 url="http://www.nvidia.com/" -depends=('kernel26>=2.6.34' 'kernel26<2.6.35' 'nvidia-173xx-utils') -makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35') +depends=('kernel26>=2.6.37' 'kernel26<2.6.38' 'nvidia-173xx-utils') +makedepends=('kernel26-headers>=2.6.37' 'kernel26-headers<2.6.38') conflicts=('nvidia-96xx' 'nvidia') license=('custom') install=nvidia.install source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run") -md5sums=('35a6531f71cd6b070f10be8ed11093d4') -[ "$CARCH" = "x86_64" ] && md5sums=('269425dbc2d9d4ecdc54692281d6d738') +md5sums=('3b2085ffc2047e701a01b3163129f763') +[ "$CARCH" = "x86_64" ] && md5sums=('8f48430f2b759d4efbf022cb415ecc5d') build() { cd $srcdir diff --git a/abs/core/nvidia-173xx/nvidia.install b/abs/core/nvidia-173xx/nvidia.install index a7e09f9..f7ecde6 100644 --- a/abs/core/nvidia-173xx/nvidia.install +++ b/abs/core/nvidia-173xx/nvidia.install @@ -1,5 +1,5 @@ post_install() { - KERNEL_VERSION='2.6.34-LinHES' + KERNEL_VERSION='2.6.37-LinHES' depmod $KERNEL_VERSION } @@ -9,6 +9,6 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.34-LinHES' + KERNEL_VERSION='2.6.37-LinHES' depmod $KERNEL_VERSION } diff --git a/abs/core/nvidia-96xx/PKGBUILD b/abs/core/nvidia-96xx/PKGBUILD index 78cd2ca..15d68b6 100644 --- a/abs/core/nvidia-96xx/PKGBUILD +++ b/abs/core/nvidia-96xx/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 69360 2010-02-20 11:24:15Z tpowa $ +# $Id: PKGBUILD 105368 2011-01-08 09:33:32Z tpowa $ # Maintainer : Thomas Baechler <thomas@archlinux.org> pkgname=nvidia-96xx -pkgver=96.43.16 -_kernver='2.6.34-LinHES' - -pkgrel=2 +pkgver=96.43.19 +_kernver='2.6.37-LinHES' +pkgrel=3 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.28' 'kernel26<2.6.29' 'nvidia-96xx-utils') -depends=('kernel26' 'nvidia-96xx-utils') -makedepends=('kernel-headers') +depends=('kernel26>=2.6.37' 'kernel26<2.6.38' 'nvidia-96xx-utils') +makedepends=('kernel26-headers>=2.6.37' 'kernel26-headers<2.6.38') 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=('7479b25c747e29af95b9ccf06f43fbf9') -[ "$CARCH" = "x86_64" ] && md5sums=('73e226d4ee0996b6df4bdf44cc1fc6f5') +md5sums=('53e98129d885a1b004aabc42a989fa73') + +[ "$CARCH" = "x86_64" ] && md5sums=('7ff779e299b938b880baff6cd970ab51') build() { cd $srcdir @@ -27,10 +26,12 @@ build() { cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0 cd usr/src/nv/ 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/ + mkdir -p $pkgdir/etc/modprobe.d + echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install } diff --git a/abs/core/nvidia-96xx/kernel-2.6.36.patch b/abs/core/nvidia-96xx/kernel-2.6.36.patch new file mode 100644 index 0000000..6b68385 --- /dev/null +++ b/abs/core/nvidia-96xx/kernel-2.6.36.patch @@ -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 diff --git a/abs/core/nvidia-96xx/nvidia.install b/abs/core/nvidia-96xx/nvidia.install index a7e09f9..f7ecde6 100644 --- a/abs/core/nvidia-96xx/nvidia.install +++ b/abs/core/nvidia-96xx/nvidia.install @@ -1,5 +1,5 @@ post_install() { - KERNEL_VERSION='2.6.34-LinHES' + KERNEL_VERSION='2.6.37-LinHES' depmod $KERNEL_VERSION } @@ -9,6 +9,6 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.34-LinHES' + KERNEL_VERSION='2.6.37-LinHES' depmod $KERNEL_VERSION } |