Author: pebender
Date: Fri Jun 12 12:17:04 2009
New Revision: 4933
Added:
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/files/NVIDIA-Linux-x86-173.14.18-pkg1-kernel_2.6.30.patch
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/files/NVIDIA-Linux-x86_64-173.14.18-pkg2-kernel_2.6.30.patch
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/files/NVIDIA-Linux-x86-71.86.09-pkg1-kernel_2.6.30.patch
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/files/NVIDIA-Linux-x86_64-71.86.09-pkg2-kernel_2.6.30.patch
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/files/NVIDIA-Linux-x86-96.43.11-pkg1-kernel_2.6.30.patch
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/files/NVIDIA-Linux-x86_64-96.43.11-pkg2-kernel_2.6.30.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/Makefile
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/checksums
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/Makefile
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/checksums
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/Makefile
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/checksums
Log:
- Patched legacy NVIDIA drivers so that they build with kernel 2.6.30.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Jun 12
12:17:04 2009
@@ -32,6 +32,9 @@
- Fixed MM_LIRC.pm so the uinput kernel module is not loaded as a
result
of MM_LIRC_FETCH_LIRCMD_CONF='no'.
+Fixed build system
+ - Patched legacy NVIDIA drivers so that they build with kernel 2.6.30.
+
Removed packages
Removed kernel-2.6.26/linux.
Removed kernel-2.6.27/linux.
Modified: trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/Makefile
==============================================================================
--- trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/Makefile (original)
+++ trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/Makefile Fri Jun 12
12:17:04 2009
@@ -1,4 +1,4 @@
-PATCHFILES = $(DISTFILE)-select_makefile.patch
+PATCHFILES = $(DISTFILE)-kernel_2.6.30.patch
$(DISTFILE)-select_makefile.patch
NVIDIA_MAJOR_VERSION = 173
NVIDIA_MINOR_VERSION = 14
Modified: trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/checksums
==============================================================================
--- trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/checksums (original)
+++ trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/checksums Fri Jun 12
12:17:04 2009
@@ -1,4 +1,6 @@
e1ed7d04187dee04ea9d32a41e2b7899
download/NVIDIA-Linux-x86-173.14.18-pkg1.run
+9244662bd9aaa9c6dc28dbafc5788f06
download/NVIDIA-Linux-x86-173.14.18-pkg1-kernel_2.6.30.patch
21c293195867d76568fc9f22f875f81a
download/NVIDIA-Linux-x86-173.14.18-pkg1-select_makefile.patch
959cbaac0340c02aebee7d1f27a9a71b
download/NVIDIA-Linux-x86_64-173.14.18-pkg2.run
+8f6edfec77dfe41756f0befc190f5d6d
download/NVIDIA-Linux-x86_64-173.14.18-pkg2-kernel_2.6.30.patch
6daa20363a92e5d5c16e73dcb456540e
download/NVIDIA-Linux-x86_64-173.14.18-pkg2-select_makefile.patch
Added:
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/files/NVIDIA-Linux-x86-173.14.18-pkg1-kernel_2.6.30.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/files/NVIDIA-Linux-x86-173.14.18-pkg1-kernel_2.6.30.patch
Fri Jun 12 12:17:04 2009
@@ -0,0 +1,105 @@
+diff -Naur NVIDIA-Linux-x86-173.14.18-pkg1-old/usr/src/nv/nv.c
NVIDIA-Linux-x86-173.14.18-pkg1-new/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86-173.14.18-pkg1-old/usr/src/nv/nv.c 2009-03-02
12:49:19.000000000 -0800
++++ NVIDIA-Linux-x86-173.14.18-pkg1-new/usr/src/nv/nv.c 2009-06-12
11:07:07.000000000 -0700
+@@ -16,6 +16,7 @@
+ #include "os-agp.h"
+ #include "nv-vm.h"
+ #include "nv-reg.h"
++#include <linux/version.h>
+
+ #ifdef MODULE_ALIAS_CHARDEV_MAJOR
+ MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);
+@@ -607,10 +608,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];
+@@ -629,7 +632,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)) {
+ /*
+@@ -642,7 +647,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);
+@@ -653,7 +660,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) {
+@@ -663,8 +672,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);
+@@ -673,7 +683,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);
+@@ -684,14 +696,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;
+
+@@ -718,8 +734,10 @@
+
+ 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
+ }
+
+ #ifdef CONFIG_PROC_FS
Added:
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/files/NVIDIA-Linux-x86_64-173.14.18-pkg2-kernel_2.6.30.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/nvidia/nvidia-173.14.18/files/NVIDIA-Linux-x86_64-173.14.18-pkg2-kernel_2.6.30.patch
Fri Jun 12 12:17:04 2009
@@ -0,0 +1,105 @@
+diff -Naur NVIDIA-Linux-x86_64-173.14.18-pkg2-old/usr/src/nv/nv.c
NVIDIA-Linux-x86_64-173.14.18-pkg2-new/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86_64-173.14.18-pkg2-old/usr/src/nv/nv.c 2009-03-02
16:00:34.000000000 -0800
++++ NVIDIA-Linux-x86_64-173.14.18-pkg2-new/usr/src/nv/nv.c 2009-06-12
11:10:44.000000000 -0700
+@@ -16,6 +16,7 @@
+ #include "os-agp.h"
+ #include "nv-vm.h"
+ #include "nv-reg.h"
++#include <linux/version.h>
+
+ #ifdef MODULE_ALIAS_CHARDEV_MAJOR
+ MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);
+@@ -607,10 +608,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];
+@@ -629,7 +632,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)) {
+ /*
+@@ -642,7 +647,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);
+@@ -653,7 +660,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) {
+@@ -663,8 +672,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);
+@@ -673,7 +683,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);
+@@ -684,14 +696,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;
+
+@@ -718,8 +734,10 @@
+
+ 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
+ }
+
+ #ifdef CONFIG_PROC_FS
Modified: trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/Makefile
==============================================================================
--- trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/Makefile (original)
+++ trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/Makefile Fri Jun 12
12:17:04 2009
@@ -1,4 +1,4 @@
-PATCHFILES = $(DISTFILE)-select_makefile.patch
+PATCHFILES = $(DISTFILE)-kernel_2.6.30.patch
$(DISTFILE)-select_makefile.patch
NVIDIA_MAJOR_VERSION = 71
NVIDIA_MINOR_VERSION = 86
Modified: trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/checksums
==============================================================================
--- trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/checksums (original)
+++ trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/checksums Fri Jun 12
12:17:04 2009
@@ -1,4 +1,6 @@
c8b092ad9243f35c7302083224a8795f
download/NVIDIA-Linux-x86-71.86.09-pkg1.run
+185b8768fd46ce8e74a8a778667f210c
download/NVIDIA-Linux-x86-71.86.09-pkg1-kernel_2.6.30.patch
edca60203c7660e31f60828630de8799
download/NVIDIA-Linux-x86-71.86.09-pkg1-select_makefile.patch
04755384f660015336602d1a5727214a
download/NVIDIA-Linux-x86_64-71.86.09-pkg2.run
+0768c9e22a9da22f335980cb5cbf9055
download/NVIDIA-Linux-x86_64-71.86.09-pkg2-kernel_2.6.30.patch
e2b8e6ef424091222e7f61d4f373360f
download/NVIDIA-Linux-x86_64-71.86.09-pkg2-select_makefile.patch
Added:
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/files/NVIDIA-Linux-x86-71.86.09-pkg1-kernel_2.6.30.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/files/NVIDIA-Linux-x86-71.86.09-pkg1-kernel_2.6.30.patch
Fri Jun 12 12:17:04 2009
@@ -0,0 +1,105 @@
+diff -Naur NVIDIA-Linux-x86-71.86.09-pkg1-old/usr/src/nv/nv.c
NVIDIA-Linux-x86-71.86.09-pkg1-new/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86-71.86.09-pkg1-old/usr/src/nv/nv.c 2009-02-23
16:24:20.000000000 -0800
++++ NVIDIA-Linux-x86-71.86.09-pkg1-new/usr/src/nv/nv.c 2009-06-12
10:53:39.000000000 -0700
+@@ -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);
+@@ -572,10 +573,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];
+@@ -594,7 +597,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)) {
+ /*
+@@ -607,7 +612,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);
+@@ -618,7 +625,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) {
+@@ -628,8 +637,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);
+@@ -638,7 +648,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);
+@@ -649,14 +661,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;
+
+@@ -683,8 +699,10 @@
+
+ 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
+ }
+
+ #ifdef CONFIG_PROC_FS
Added:
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/files/NVIDIA-Linux-x86_64-71.86.09-pkg2-kernel_2.6.30.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/nvidia/nvidia-71.86.09/files/NVIDIA-Linux-x86_64-71.86.09-pkg2-kernel_2.6.30.patch
Fri Jun 12 12:17:04 2009
@@ -0,0 +1,105 @@
+diff -Naur NVIDIA-Linux-x86_64-71.86.09-pkg2-old/usr/src/nv/nv.c
NVIDIA-Linux-x86_64-71.86.09-pkg2-new/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86_64-71.86.09-pkg2-old/usr/src/nv/nv.c 2009-02-23
16:46:31.000000000 -0800
++++ NVIDIA-Linux-x86_64-71.86.09-pkg2-new/usr/src/nv/nv.c 2009-06-12
10:55:42.000000000 -0700
+@@ -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);
+@@ -572,10 +573,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];
+@@ -594,7 +597,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)) {
+ /*
+@@ -607,7 +612,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);
+@@ -618,7 +625,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) {
+@@ -628,8 +637,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);
+@@ -638,7 +648,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);
+@@ -649,14 +661,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;
+
+@@ -683,8 +699,10 @@
+
+ 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
+ }
+
+ #ifdef CONFIG_PROC_FS
Modified: trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/Makefile
==============================================================================
--- trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/Makefile (original)
+++ trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/Makefile Fri Jun 12
12:17:04 2009
@@ -1,4 +1,4 @@
-PATCHFILES = $(DISTFILE)-select_makefile.patch
+PATCHFILES = $(DISTFILE)-kernel_2.6.30.patch
$(DISTFILE)-select_makefile.patch
NVIDIA_MAJOR_VERSION = 96
NVIDIA_MINOR_VERSION = 43
Modified: trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/checksums
==============================================================================
--- trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/checksums (original)
+++ trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/checksums Fri Jun 12
12:17:04 2009
@@ -1,4 +1,6 @@
62aa8c922b44c7cf3e581ff73bac7c96
download/NVIDIA-Linux-x86-96.43.11-pkg1.run
+d3f9d4d3c42f4fe815d769c4cfbba778
download/NVIDIA-Linux-x86-96.43.11-pkg1-kernel_2.6.30.patch
1f74a0adaebed7eb413a8255a4de3cb6
download/NVIDIA-Linux-x86-96.43.11-pkg1-select_makefile.patch
db329587305136aa1adc89c375c60057
download/NVIDIA-Linux-x86_64-96.43.11-pkg2.run
+696938a4e4151fe69993abe427b71ef5
download/NVIDIA-Linux-x86_64-96.43.11-pkg2-kernel_2.6.30.patch
906025e1c89c90c693d50b65fdd4d311
download/NVIDIA-Linux-x86_64-96.43.11-pkg2-select_makefile.patch
Added:
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/files/NVIDIA-Linux-x86-96.43.11-pkg1-kernel_2.6.30.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/files/NVIDIA-Linux-x86-96.43.11-pkg1-kernel_2.6.30.patch
Fri Jun 12 12:17:04 2009
@@ -0,0 +1,105 @@
+diff -Naur NVIDIA-Linux-x86-96.43.11-pkg1-old/usr/src/nv/nv.c
NVIDIA-Linux-x86-96.43.11-pkg1-new/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86-96.43.11-pkg1-old/usr/src/nv/nv.c 2009-02-23
15:46:00.000000000 -0800
++++ NVIDIA-Linux-x86-96.43.11-pkg1-new/usr/src/nv/nv.c 2009-06-12
10:46:50.000000000 -0700
+@@ -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,8 +626,10 @@
+
+ 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
+ }
+
+ #ifdef CONFIG_PROC_FS
Added:
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/files/NVIDIA-Linux-x86_64-96.43.11-pkg2-kernel_2.6.30.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/nvidia/nvidia-96.43.11/files/NVIDIA-Linux-x86_64-96.43.11-pkg2-kernel_2.6.30.patch
Fri Jun 12 12:17:04 2009
@@ -0,0 +1,105 @@
+diff -Naur NVIDIA-Linux-x86_64-96.43.11-pkg2-old/usr/src/nv/nv.c
NVIDIA-Linux-x86_64-96.43.11-pkg2-new/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86_64-96.43.11-pkg2-old/usr/src/nv/nv.c 2009-02-23
16:16:24.000000000 -0800
++++ NVIDIA-Linux-x86_64-96.43.11-pkg2-new/usr/src/nv/nv.c 2009-06-12
10:50:22.000000000 -0700
+@@ -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,8 +626,10 @@
+
+ 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
+ }
+
+ #ifdef CONFIG_PROC_FS
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
