381.09381.09

8 files changed, 103 insertions, 96 deletions

diff --git a/command-list.c b/command-list.c
index ec22f7b..40a04d9 100644
--- a/command-list.c
+++ b/command-list.c
@@ -906,7 +906,7 @@ ConflictingFileInfo *build_conflicting_file_list(Options *op, Package *p)
 
     for (i = 0; i < p->num_entries; i++) {
         PackageEntry *entry = &p->entries[i];
-        if (entry->caps.is_shared_lib && !entry->caps.is_wrapper) {
+        if (entry->caps.is_shared_lib && entry->caps.is_conflicting) {
             get_conflicting_file_info(entry->name, &cfList[index++]);
         }
     }
diff --git a/files.c b/files.c
index 86ae4cd..5612030 100644
--- a/files.c
+++ b/files.c
@@ -757,6 +757,8 @@ int set_destinations(Options *op, Package *p)
 
         case FILE_TYPE_GRID_LIB:
         case FILE_TYPE_GRID_LIB_SYMLINK:
+        case FILE_TYPE_FLEXERA_LIB:
+        case FILE_TYPE_FLEXERA_LIB_SYMLINK:
             prefix = op->opengl_prefix;
             dir = op->opengl_libdir;
             path = p->entries[i].path;
diff --git a/install-from-cwd.c b/install-from-cwd.c
index 3a1f8f6..47ebdf6 100644
--- a/install-from-cwd.c
+++ b/install-from-cwd.c
@@ -312,8 +312,10 @@ int install_from_cwd(Options *op)
      */
 
     if (!op->no_kernel_module || op->dkms) {
-        if (!load_kernel_module(op, "nvidia-drm")) {
-            goto failed;
+        if (package_includes_kernel_module(p, "nvidia-drm")) {
+            if (!load_kernel_module(op, "nvidia-drm")) {
+                goto failed;
+            }
         }
 
         if (package_includes_kernel_module(p, "nvidia-vgpu-vfio")) {
diff --git a/kernel.c b/kernel.c
index 511215b..0dee65f 100644
--- a/kernel.c
+++ b/kernel.c
@@ -1376,7 +1376,7 @@ int test_kernel_modules(Options *op, Package *p)
 {
     char *cmd = NULL, *data = NULL;
     int ret, i;
-    const char *depmods[] = { "i2c-core", "drm", "drm-kms-helper" };
+    const char *depmods[] = { "i2c-core", "drm", "drm-kms-helper", "vfio_mdev" };
 
     /* 
      * If we're building/installing for a different kernel, then we
diff --git a/manifest.c b/manifest.c
index 473438e..4a8bd2c 100644
--- a/manifest.c
+++ b/manifest.c
@@ -33,23 +33,23 @@
               _is_shared_lib,                                           \
               _is_opengl,                                               \
               _is_temporary,                                            \
-              _is_wrapper,                                              \
+              _is_conflicting,                                          \
               _inherit_path,                                            \
               _glvnd_select                                             \
              )                                                          \
     #_name , FILE_TYPE_ ## _name ,                                      \
         {                                                               \
-            .has_arch      = _has_arch,                                 \
-            .has_tls_class = _has_tls_class,                            \
-            .installable   = _installable,                              \
-            .has_path      = _has_path,                                 \
-            .is_symlink    = _is_symlink,                               \
-            .is_shared_lib = _is_shared_lib,                            \
-            .is_opengl     = _is_opengl,                                \
-            .is_temporary  = _is_temporary,                             \
-            .is_wrapper    = _is_wrapper,                               \
-            .inherit_path  = _inherit_path,                             \
-            .glvnd_select  = _glvnd_select,                             \
+            .has_arch       = _has_arch,                                \
+            .has_tls_class  = _has_tls_class,                           \
+            .installable    = _installable,                             \
+            .has_path       = _has_path,                                \
+            .is_symlink     = _is_symlink,                              \
+            .is_shared_lib  = _is_shared_lib,                           \
+            .is_opengl      = _is_opengl,                               \
+            .is_temporary   = _is_temporary,                            \
+            .is_conflicting = _is_conflicting,                          \
+            .inherit_path   = _inherit_path,                            \
+            .glvnd_select   = _glvnd_select,                            \
         }
 
 /*
@@ -63,75 +63,77 @@ static const struct {
 } packageEntryFileTypeTable[] = {
 
     /*
-     * glvnd_select  -------------------------------------------------+
-     * inherit_path  ----------------------------------------------+  |
-     * is_wrapper    -------------------------------------------+  |  |
-     * is_temporary  ----------------------------------------+  |  |  |
-     * is_opengl     -------------------------------------+  |  |  |  |
-     * is_shared_lib ----------------------------------+  |  |  |  |  |
-     * is_symlink    -------------------------------+  |  |  |  |  |  |
-     * has_path      ----------------------------+  |  |  |  |  |  |  |
-     * installable   -------------------------+  |  |  |  |  |  |  |  |
-     * has_tls_class ----------------------+  |  |  |  |  |  |  |  |  |
-     * has_arch      -------------------+  |  |  |  |  |  |  |  |  |  |
+     * glvnd_select   ------------------------------------------------+
+     * inherit_path   ---------------------------------------------+  |
+     * is_conflicting ------------------------------------------+  |  |
+     * is_temporary   ---------------------------------------+  |  |  |
+     * is_opengl      ------------------------------------+  |  |  |  |
+     * is_shared_lib  ---------------------------------+  |  |  |  |  |
+     * is_symlink     ------------------------------+  |  |  |  |  |  |
+     * has_path       ---------------------------+  |  |  |  |  |  |  |
+     * installable    ------------------------+  |  |  |  |  |  |  |  |
+     * has_tls_class  ---------------------+  |  |  |  |  |  |  |  |  |
+     * has_arch       ------------------+  |  |  |  |  |  |  |  |  |  |
      *                                  |  |  |  |  |  |  |  |  |  |  |
      */
-    { ENTRY(KERNEL_MODULE_SRC,          F, F, T, F, F, F, F, F, F, T, F) },
-    { ENTRY(KERNEL_MODULE,              F, F, T, F, F, F, F, F, F, F, F) },
-    { ENTRY(OPENGL_HEADER,              F, F, T, T, F, F, T, F, F, F, F) },
-    { ENTRY(CUDA_ICD,                   F, F, T, F, F, F, F, F, F, F, F) },
-    { ENTRY(OPENGL_LIB,                 T, F, T, F, F, T, T, F, F, F, F) },
-    { ENTRY(CUDA_LIB,                   T, F, T, T, F, T, F, F, F, F, F) },
-    { ENTRY(OPENCL_LIB,                 T, F, T, T, F, T, F, F, F, F, F) },
-    { ENTRY(OPENCL_WRAPPER_LIB,         T, F, T, T, F, T, F, F, T, F, F) },
-    { ENTRY(OPENCL_LIB_SYMLINK,         T, F, F, T, T, F, F, F, F, F, F) },
-    { ENTRY(OPENCL_WRAPPER_SYMLINK,     T, F, F, T, T, F, F, F, T, F, F) },
-    { ENTRY(LIBGL_LA,                   T, F, T, F, F, F, T, T, F, F, F) },
-    { ENTRY(TLS_LIB,                    T, T, T, T, F, T, T, F, F, F, F) },
-    { ENTRY(UTILITY_LIB,                T, F, T, F, F, T, F, F, F, F, F) },
-    { ENTRY(DOCUMENTATION,              F, F, T, T, F, F, F, F, F, F, F) },
-    { ENTRY(APPLICATION_PROFILE,        F, F, T, T, F, F, F, F, F, F, F) },
-    { ENTRY(MANPAGE,                    F, F, T, T, F, F, F, F, F, F, F) },
-    { ENTRY(EXPLICIT_PATH,              F, F, T, T, F, F, F, F, F, F, F) },
-    { ENTRY(OPENGL_SYMLINK,             T, F, F, F, T, F, T, F, F, F, F) },
-    { ENTRY(CUDA_SYMLINK,               T, F, F, T, T, F, F, F, F, F, F) },
-    { ENTRY(TLS_SYMLINK,                T, T, F, T, T, F, T, F, F, F, F) },
-    { ENTRY(UTILITY_LIB_SYMLINK,        T, F, F, F, T, F, F, F, F, F, F) },
-    { ENTRY(INSTALLER_BINARY,           F, F, T, F, F, F, F, F, F, F, F) },
-    { ENTRY(UTILITY_BINARY,             F, F, T, F, F, F, F, F, F, F, F) },
-    { ENTRY(UTILITY_BIN_SYMLINK,        F, F, F, F, T, F, F, F, F, F, F) },
-    { ENTRY(DOT_DESKTOP,                F, F, T, T, F, F, F, T, F, F, F) },
-    { ENTRY(XMODULE_SHARED_LIB,         F, F, T, T, F, T, F, F, F, F, F) },
-    { ENTRY(XMODULE_SYMLINK,            F, F, F, T, T, F, F, F, F, F, F) },
-    { ENTRY(GLX_MODULE_SHARED_LIB,      F, F, T, T, F, T, T, F, F, F, F) },
-    { ENTRY(GLX_MODULE_SYMLINK,         F, F, F, T, T, F, T, F, F, F, F) },
-    { ENTRY(XMODULE_NEWSYM,             F, F, F, T, T, F, F, F, F, F, F) },
-    { ENTRY(VDPAU_LIB,                  T, F, T, T, F, T, F, F, F, F, F) },
-    { ENTRY(VDPAU_SYMLINK,              T, F, F, T, T, F, F, F, F, F, F) },
-    { ENTRY(NVCUVID_LIB,                T, F, T, F, F, T, F, F, F, F, F) },
-    { ENTRY(NVCUVID_LIB_SYMLINK,        T, F, F, F, T, F, F, F, F, F, F) },
-    { ENTRY(ENCODEAPI_LIB,              T, F, T, F, F, T, F, F, F, F, F) },
-    { ENTRY(ENCODEAPI_LIB_SYMLINK,      T, F, F, F, T, F, F, F, F, F, F) },
-    { ENTRY(VGX_LIB,                    F, F, T, F, F, T, F, F, F, F, F) },
-    { ENTRY(VGX_LIB_SYMLINK,            F, F, F, F, T, F, F, F, F, F, F) },
-    { ENTRY(GRID_LIB,                   F, F, T, T, F, T, F, F, F, F, F) },
-    { ENTRY(GRID_LIB_SYMLINK,           F, F, F, T, T, F, F, F, F, F, F) },
-    { ENTRY(NVIDIA_MODPROBE,            F, F, T, T, F, F, F, F, F, F, F) },
-    { ENTRY(NVIDIA_MODPROBE_MANPAGE,    F, F, T, T, F, F, F, F, F, F, F) },
-    { ENTRY(MODULE_SIGNING_KEY,         F, F, T, F, F, F, F, T, F, F, F) },
-    { ENTRY(NVIFR_LIB,                  T, F, T, F, F, T, F, F, F, F, F) },
-    { ENTRY(NVIFR_LIB_SYMLINK,          T, F, F, F, T, F, F, F, F, F, F) },
-    { ENTRY(XORG_OUTPUTCLASS_CONFIG,    F, F, T, F, F, F, F, F, F, F, F) },
-    { ENTRY(DKMS_CONF              ,    F, F, T, F, F, F, F, T, F, T, F) },
-    { ENTRY(GLVND_LIB,                  T, F, T, F, F, T, T, F, F, F, F) },
-    { ENTRY(GLVND_SYMLINK,              T, F, F, F, T, F, T, F, F, F, F) },
-    { ENTRY(GLX_CLIENT_LIB,             T, F, T, F, F, T, T, F, F, F, T) },
-    { ENTRY(GLX_CLIENT_SYMLINK,         T, F, F, F, T, F, T, F, F, F, T) },
-    { ENTRY(VULKAN_ICD_JSON,            F, F, T, F, F, F, F, F, F, F, F) },
-    { ENTRY(GLVND_EGL_ICD_JSON,         F, F, T, F, F, F, T, F, F, F, F) },
-    { ENTRY(EGL_CLIENT_LIB,             T, F, T, F, F, T, T, F, F, F, T) },
-    { ENTRY(EGL_CLIENT_SYMLINK,         T, F, F, F, T, F, T, F, F, F, T) },
-    { ENTRY(EGL_EXTERNAL_PLATFORM_JSON, F, F, T, F, F, F, T, F, F, F, F) },
+    { ENTRY(KERNEL_MODULE_SRC,          F, F, T, F, F, F, F, F, T, T, F) },
+    { ENTRY(KERNEL_MODULE,              F, F, T, F, F, F, F, F, T, F, F) },
+    { ENTRY(OPENGL_HEADER,              F, F, T, T, F, F, T, F, T, F, F) },
+    { ENTRY(CUDA_ICD,                   F, F, T, F, F, F, F, F, T, F, F) },
+    { ENTRY(OPENGL_LIB,                 T, F, T, F, F, T, T, F, T, F, F) },
+    { ENTRY(CUDA_LIB,                   T, F, T, T, F, T, F, F, T, F, F) },
+    { ENTRY(OPENCL_LIB,                 T, F, T, T, F, T, F, F, T, F, F) },
+    { ENTRY(OPENCL_WRAPPER_LIB,         T, F, T, T, F, T, F, F, F, F, F) },
+    { ENTRY(OPENCL_LIB_SYMLINK,         T, F, F, T, T, F, F, F, T, F, F) },
+    { ENTRY(OPENCL_WRAPPER_SYMLINK,     T, F, F, T, T, F, F, F, F, F, F) },
+    { ENTRY(LIBGL_LA,                   T, F, T, F, F, F, T, T, T, F, F) },
+    { ENTRY(TLS_LIB,                    T, T, T, T, F, T, T, F, T, F, F) },
+    { ENTRY(UTILITY_LIB,                T, F, T, F, F, T, F, F, T, F, F) },
+    { ENTRY(DOCUMENTATION,              F, F, T, T, F, F, F, F, T, F, F) },
+    { ENTRY(APPLICATION_PROFILE,        F, F, T, T, F, F, F, F, T, F, F) },
+    { ENTRY(MANPAGE,                    F, F, T, T, F, F, F, F, T, F, F) },
+    { ENTRY(EXPLICIT_PATH,              F, F, T, T, F, F, F, F, T, F, F) },
+    { ENTRY(OPENGL_SYMLINK,             T, F, F, F, T, F, T, F, T, F, F) },
+    { ENTRY(CUDA_SYMLINK,               T, F, F, T, T, F, F, F, T, F, F) },
+    { ENTRY(TLS_SYMLINK,                T, T, F, T, T, F, T, F, T, F, F) },
+    { ENTRY(UTILITY_LIB_SYMLINK,        T, F, F, F, T, F, F, F, T, F, F) },
+    { ENTRY(INSTALLER_BINARY,           F, F, T, F, F, F, F, F, T, F, F) },
+    { ENTRY(UTILITY_BINARY,             F, F, T, F, F, F, F, F, T, F, F) },
+    { ENTRY(UTILITY_BIN_SYMLINK,        F, F, F, F, T, F, F, F, T, F, F) },
+    { ENTRY(DOT_DESKTOP,                F, F, T, T, F, F, F, T, T, F, F) },
+    { ENTRY(XMODULE_SHARED_LIB,         F, F, T, T, F, T, F, F, T, F, F) },
+    { ENTRY(XMODULE_SYMLINK,            F, F, F, T, T, F, F, F, T, F, F) },
+    { ENTRY(GLX_MODULE_SHARED_LIB,      F, F, T, T, F, T, T, F, T, F, F) },
+    { ENTRY(GLX_MODULE_SYMLINK,         F, F, F, T, T, F, T, F, T, F, F) },
+    { ENTRY(XMODULE_NEWSYM,             F, F, F, T, T, F, F, F, T, F, F) },
+    { ENTRY(VDPAU_LIB,                  T, F, T, T, F, T, F, F, T, F, F) },
+    { ENTRY(VDPAU_SYMLINK,              T, F, F, T, T, F, F, F, T, F, F) },
+    { ENTRY(NVCUVID_LIB,                T, F, T, F, F, T, F, F, T, F, F) },
+    { ENTRY(NVCUVID_LIB_SYMLINK,        T, F, F, F, T, F, F, F, T, F, F) },
+    { ENTRY(ENCODEAPI_LIB,              T, F, T, F, F, T, F, F, T, F, F) },
+    { ENTRY(ENCODEAPI_LIB_SYMLINK,      T, F, F, F, T, F, F, F, T, F, F) },
+    { ENTRY(VGX_LIB,                    F, F, T, F, F, T, F, F, T, F, F) },
+    { ENTRY(VGX_LIB_SYMLINK,            F, F, F, F, T, F, F, F, T, F, F) },
+    { ENTRY(GRID_LIB,                   F, F, T, T, F, T, F, F, T, F, F) },
+    { ENTRY(GRID_LIB_SYMLINK,           F, F, F, T, T, F, F, F, T, F, F) },
+    { ENTRY(NVIDIA_MODPROBE,            F, F, T, T, F, F, F, F, T, F, F) },
+    { ENTRY(NVIDIA_MODPROBE_MANPAGE,    F, F, T, T, F, F, F, F, T, F, F) },
+    { ENTRY(MODULE_SIGNING_KEY,         F, F, T, F, F, F, F, T, T, F, F) },
+    { ENTRY(NVIFR_LIB,                  T, F, T, F, F, T, F, F, T, F, F) },
+    { ENTRY(NVIFR_LIB_SYMLINK,          T, F, F, F, T, F, F, F, T, F, F) },
+    { ENTRY(XORG_OUTPUTCLASS_CONFIG,    F, F, T, F, F, F, F, F, T, F, F) },
+    { ENTRY(DKMS_CONF              ,    F, F, T, F, F, F, F, T, T, T, F) },
+    { ENTRY(GLVND_LIB,                  T, F, T, F, F, T, T, F, T, F, F) },
+    { ENTRY(GLVND_SYMLINK,              T, F, F, F, T, F, T, F, T, F, F) },
+    { ENTRY(GLX_CLIENT_LIB,             T, F, T, F, F, T, T, F, T, F, T) },
+    { ENTRY(GLX_CLIENT_SYMLINK,         T, F, F, F, T, F, T, F, T, F, T) },
+    { ENTRY(VULKAN_ICD_JSON,            F, F, T, F, F, F, F, F, T, F, F) },
+    { ENTRY(GLVND_EGL_ICD_JSON,         F, F, T, F, F, F, T, F, T, F, F) },
+    { ENTRY(EGL_CLIENT_LIB,             T, F, T, F, F, T, T, F, T, F, T) },
+    { ENTRY(EGL_CLIENT_SYMLINK,         T, F, F, F, T, F, T, F, T, F, T) },
+    { ENTRY(EGL_EXTERNAL_PLATFORM_JSON, F, F, T, F, F, F, T, F, T, F, F) },
+    { ENTRY(FLEXERA_LIB,                F, F, T, T, F, T, F, F, F, F, F) },
+    { ENTRY(FLEXERA_LIB_SYMLINK,        F, F, F, T, T, F, F, F, F, F, F) },
 };
 
 /*
diff --git a/nvLegacy.h b/nvLegacy.h
index d24cfd1..031b51a 100644
--- a/nvLegacy.h
+++ b/nvLegacy.h
@@ -568,7 +568,6 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x10D8, 0x0000, 0x0000,  5,      "NVS 300" },
     { 0x0FEF, 0x0000, 0x0000,  6,      "GRID K340" },
     { 0x0FF2, 0x0000, 0x0000,  6,      "GRID K1" },
-    { 0x118A, 0x0000, 0x0000,  6,      "GRID K520" },
     { 0x11BF, 0x0000, 0x0000,  6,      "GRID K2" }
 };
 
diff --git a/nvidia-installer.h b/nvidia-installer.h
index a0265cb..6f66466 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -297,6 +297,8 @@ typedef enum {
     FILE_TYPE_EGL_CLIENT_LIB,
     FILE_TYPE_EGL_CLIENT_SYMLINK,
     FILE_TYPE_EGL_EXTERNAL_PLATFORM_JSON,
+    FILE_TYPE_FLEXERA_LIB,
+    FILE_TYPE_FLEXERA_LIB_SYMLINK,
     FILE_TYPE_MAX
 } PackageEntryFileType;
 
@@ -319,17 +321,17 @@ typedef enum {
 } PackageEntryFileGLVND;
 
 typedef struct {
-    unsigned int has_arch      : 1;
-    unsigned int has_tls_class : 1;
-    unsigned int installable   : 1;
-    unsigned int has_path      : 1;
-    unsigned int is_symlink    : 1;
-    unsigned int is_shared_lib : 1;
-    unsigned int is_opengl     : 1;
-    unsigned int is_temporary  : 1;
-    unsigned int is_wrapper    : 1;
-    unsigned int inherit_path  : 1;
-    unsigned int glvnd_select  : 1;
+    unsigned int has_arch       : 1;
+    unsigned int has_tls_class  : 1;
+    unsigned int installable    : 1;
+    unsigned int has_path       : 1;
+    unsigned int is_symlink     : 1;
+    unsigned int is_shared_lib  : 1;
+    unsigned int is_opengl      : 1;
+    unsigned int is_temporary   : 1;
+    unsigned int is_conflicting : 1;
+    unsigned int inherit_path   : 1;
+    unsigned int glvnd_select   : 1;
 } PackageEntryFileCapabilities;
 
 /*
diff --git a/version.mk b/version.mk
index 3ad7ef3..e21b358 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 378.13
+NVIDIA_VERSION = 381.09