diff options
author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core-testing/nvidia-96xx | |
parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core-testing/nvidia-96xx')
-rw-r--r-- | abs/core-testing/nvidia-96xx/PKGBUILD | 36 | ||||
-rw-r--r-- | abs/core-testing/nvidia-96xx/nvidia-96.43.11-2.6.30.patch | 103 | ||||
-rw-r--r-- | abs/core-testing/nvidia-96xx/nvidia.install | 14 |
3 files changed, 0 insertions, 153 deletions
diff --git a/abs/core-testing/nvidia-96xx/PKGBUILD b/abs/core-testing/nvidia-96xx/PKGBUILD deleted file mode 100644 index 78cd2ca..0000000 --- a/abs/core-testing/nvidia-96xx/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 69360 2010-02-20 11:24:15Z tpowa $ -# Maintainer : Thomas Baechler <thomas@archlinux.org> - -pkgname=nvidia-96xx -pkgver=96.43.16 -_kernver='2.6.34-LinHES' - -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.28' 'kernel26<2.6.29' 'nvidia-96xx-utils') -depends=('kernel26' 'nvidia-96xx-utils') -makedepends=('kernel-headers') -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') - -build() { - cd $srcdir - sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only - cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0 - cd usr/src/nv/ - ln -s Makefile.kbuild Makefile - make SYSSRC=/lib/modules/${_kernver}/build module || return 1 - - mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/ - install -m644 nvidia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/ - - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install -} diff --git a/abs/core-testing/nvidia-96xx/nvidia-96.43.11-2.6.30.patch b/abs/core-testing/nvidia-96xx/nvidia-96.43.11-2.6.30.patch deleted file mode 100644 index 44d44fd..0000000 --- a/abs/core-testing/nvidia-96xx/nvidia-96.43.11-2.6.30.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- usr/src/nv/nv.c.orig -+++ usr/src/nv/nv.c -@@ -15,6 +15,7 @@ - #include "nv_compiler.h" - #include "os-agp.h" - #include "nv-vm.h" -+#include <linux/version.h> - - #ifdef MODULE_ALIAS_CHARDEV_MAJOR - MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER); -@@ -499,10 +500,12 @@ - * Set the module owner to ensure that the reference - * count reflects accesses to the proc files. - */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - proc_nvidia->owner = THIS_MODULE; - proc_nvidia_cards->owner = THIS_MODULE; - proc_nvidia_warnings->owner = THIS_MODULE; - -+#endif - for (j = 0; j < num_nv_devices; j++) - { - nvl = &nv_linux_devices[j]; -@@ -521,7 +524,9 @@ - - entry->data = nv; - entry->read_proc = nv_kern_read_cardinfo; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - - if (nvos_find_agp_capability(dev)) { - /* -@@ -534,7 +539,9 @@ - goto failed; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - proc_nvidia_agp = entry; - - entry = create_proc_entry("status", flags, proc_nvidia_agp); -@@ -545,7 +552,9 @@ - - entry->data = nv; - entry->read_proc = nv_kern_read_status; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - - entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp); - if (!entry) { -@@ -555,8 +564,9 @@ - - entry->data = NULL; - entry->read_proc = nv_kern_read_agpinfo; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -- -+#endif - entry = create_proc_entry("card", flags, proc_nvidia_agp); - if (!entry) { - NV_PCI_DEV_PUT(dev); -@@ -565,7 +575,9 @@ - - entry->data = nv; - entry->read_proc = nv_kern_read_agpinfo; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - } - - NV_PCI_DEV_PUT(dev); -@@ -576,14 +588,18 @@ - goto failed; - - entry->read_proc = nv_kern_read_version; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - - entry = create_proc_entry("registry", flags, proc_nvidia); - if (!entry) - goto failed; - - entry->read_proc = nv_kern_read_registry; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - - return; - -@@ -610,7 +626,9 @@ - - entry->data = (void *)message; - entry->read_proc = nv_kern_read_warning; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - #endif - } - diff --git a/abs/core-testing/nvidia-96xx/nvidia.install b/abs/core-testing/nvidia-96xx/nvidia.install deleted file mode 100644 index a7e09f9..0000000 --- a/abs/core-testing/nvidia-96xx/nvidia.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - KERNEL_VERSION='2.6.34-LinHES' - depmod $KERNEL_VERSION -} - -post_upgrade() { - post_install - rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.' -} - -post_remove() { - KERNEL_VERSION='2.6.34-LinHES' - depmod $KERNEL_VERSION -} |