diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2009-12-22 17:16:44 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2009-12-22 17:16:44 -0800 |
| commit | e869d50ced2a6c65c9be714de2ec631e950d4a1f (patch) | |
| tree | 0c247b8dcc6216e42693ee23e13f103206d9fb61 | |
| parent | 3cb604acdf3ee68ff6420372d367768b60383d56 (diff) | |
195.30195.30
| -rw-r--r-- | DRIVER_VERSION | 2 | ||||
| -rw-r--r-- | files.c | 6 | ||||
| -rw-r--r-- | install-from-cwd.c | 2 | ||||
| -rw-r--r-- | makefile.nvmk | 2 | ||||
| -rw-r--r-- | nvidia-installer.h | 10 |
5 files changed, 20 insertions, 2 deletions
diff --git a/DRIVER_VERSION b/DRIVER_VERSION index 6cdbcbe..4baa759 100644 --- a/DRIVER_VERSION +++ b/DRIVER_VERSION @@ -1 +1 @@ -195.22 +195.30 @@ -536,6 +536,12 @@ int set_destinations(Options *op, Package *p) } path = p->entries[i].path; break; + + case FILE_TYPE_CUDA_ICD: + prefix = DEFAULT_CUDA_ICD_PREFIX; + dir = DEFAULT_CUDA_ICD_DIR; + path = ""; + break; case FILE_TYPE_XLIB_SHARED_LIB: case FILE_TYPE_XLIB_STATIC_LIB: diff --git a/install-from-cwd.c b/install-from-cwd.c index 07df293..2af25f2 100644 --- a/install-from-cwd.c +++ b/install-from-cwd.c @@ -677,6 +677,8 @@ static Package *parse_manifest (Options *op) p->entries[n].flags |= FILE_TYPE_OPENGL_HEADER; else if (strcmp(flag, "CUDA_HEADER") == 0) p->entries[n].flags |= FILE_TYPE_CUDA_HEADER; + else if (strcmp(flag, "CUDA_ICD") == 0) + p->entries[n].flags |= FILE_TYPE_CUDA_ICD; else if (strcmp(flag, "OPENGL_LIB") == 0) p->entries[n].flags |= FILE_TYPE_OPENGL_LIB; else if (strcmp(flag, "CUDA_LIB") == 0) diff --git a/makefile.nvmk b/makefile.nvmk index 7ee1fb5..2a94e8c 100644 --- a/makefile.nvmk +++ b/makefile.nvmk @@ -107,7 +107,7 @@ OTHER_FILES_TO_REMOVE += $(NV_LEGACY_H) $(NV_LEGACY_GENERATOR) # include the list of nvidia-installer source files; defines DIST_FILES include dist-files.mk -NVIDIA_INSTALLER_DISTDIR_NO_OUTPUTDIR = nvidia-installer-$(NV_VERSION_STRING) +NVIDIA_INSTALLER_DISTDIR_NO_OUTPUTDIR = nvidia-installer-$(NV_PACKAGE_FILENAME_VERSION_STRING) NVIDIA_INSTALLER_DISTDIR = $(OUTPUTDIR)/$(NVIDIA_INSTALLER_DISTDIR_NO_OUTPUTDIR) NVIDIA_INSTALLER_TARBALL_NO_OUTPUTDIR = $(NVIDIA_INSTALLER_DISTDIR_NO_OUTPUTDIR).tar.bz2 NVIDIA_INSTALLER_TARBALL = $(NVIDIA_INSTALLER_DISTDIR).tar.bz2 diff --git a/nvidia-installer.h b/nvidia-installer.h index c90e785..e1d7285 100644 --- a/nvidia-installer.h +++ b/nvidia-installer.h @@ -327,6 +327,8 @@ typedef struct { #define FILE_TYPE_VDPAU_SYMLINK 0x0000000004000000ULL #define FILE_TYPE_VDPAU_HEADER 0x0000000008000000ULL #define FILE_TYPE_UTILITY_BIN_SYMLINK 0x0000000010000000ULL +#define FILE_TYPE_CUDA_ICD 0x0000000020000000ULL + /* file class: this is used to distinguish OpenGL libraries */ @@ -351,6 +353,7 @@ typedef struct { FILE_TYPE_MANPAGE | \ FILE_TYPE_OPENGL_HEADER | \ FILE_TYPE_CUDA_HEADER | \ + FILE_TYPE_CUDA_ICD | \ FILE_TYPE_KERNEL_MODULE | \ FILE_TYPE_INSTALLER_BINARY | \ FILE_TYPE_UTILITY_BINARY | \ @@ -500,6 +503,13 @@ typedef struct { #define NV_BULLET_STR "-> " #define NV_CMD_OUT_PREFIX " " +/* + * The OpenCL ICD Loader will look for the NVIDIA ICD + * in /etc/OpenCL/vendors + */ +#define DEFAULT_CUDA_ICD_PREFIX "/etc" +#define DEFAULT_CUDA_ICD_DIR "OpenCL/vendors" + /* useful macros */ #define NV_MIN(x,y) ((x) < (y) ? (x) : (y)) |