450.51450.51

6 files changed, 21 insertions, 89 deletions

diff --git a/files.c b/files.c
index bdc80bd..e3bdcc3 100644
--- a/files.c
+++ b/files.c
@@ -634,17 +634,6 @@ int set_destinations(Options *op, Package *p)
             path = "";
             break;
 
-        case FILE_TYPE_LIBGL_LA:
-            if (p->entries[i].compat_arch == FILE_COMPAT_ARCH_COMPAT32) {
-                prefix = op->compat32_prefix;
-                dir = op->compat32_libdir;
-            } else {
-                prefix = op->opengl_prefix;
-                dir = op->opengl_libdir;
-            }
-            path = "";
-            break;
-
         case FILE_TYPE_NVCUVID_LIB:
         case FILE_TYPE_NVCUVID_LIB_SYMLINK:
             if (p->entries[i].compat_arch == FILE_COMPAT_ARCH_COMPAT32) {
@@ -795,6 +784,18 @@ int set_destinations(Options *op, Package *p)
             dir = path = "";
             break;
 
+        case FILE_TYPE_INTERNAL_UTILITY_BINARY:
+        case FILE_TYPE_INTERNAL_UTILITY_LIB:
+        case FILE_TYPE_INTERNAL_UTILITY_DATA:
+            if (p->entries[i].compat_arch == FILE_COMPAT_ARCH_COMPAT32) {
+                // TODO: Avoid the chroot stuff below for this?
+                prefix = "/usr/lib/nvidia/32";
+            } else {
+                prefix = "/usr/lib/nvidia";
+            }
+            dir = path = "";
+            break;
+
         default:
             
             /* 
@@ -1923,77 +1924,6 @@ done:
 
 
 /*
- * process_libGL_la_files() - for any libGL.la files in the package,
- * copy them to a temporary file, replacing __GENERATED_BY__ and
- * __LIBGL_PATH__ as appropriate.  Then, add the new file to the
- * package list.
- */
-
-void process_libGL_la_files(Options *op, Package *p)
-{
-    int i;
-    char *tmpfile;
-
-    char *tokens[3] = { "__LIBGL_PATH__", "__GENERATED_BY__", NULL };
-    char *replacements[3] = { NULL, NULL, NULL };
-
-    int package_num_entries = p->num_entries;
-
-    replacements[1] = nvstrcat(PROGRAM_NAME, ": ",
-                               NVIDIA_INSTALLER_VERSION, NULL);
-
-    for (i = 0; i < package_num_entries; i++) {
-        if ((p->entries[i].type == FILE_TYPE_LIBGL_LA)) {
-    
-            if (p->entries[i].compat_arch == FILE_COMPAT_ARCH_COMPAT32) {
-                replacements[0] = nvstrcat(op->compat32_prefix,
-                                           "/", op->compat32_libdir, NULL);
-            } else {
-                replacements[0] = nvstrcat(op->opengl_prefix,
-                                           "/", op->opengl_libdir, NULL);
-            }
-
-            /* invalidate the template file */
-
-            invalidate_package_entry(&(p->entries[i]));
-
-            tmpfile = process_template_file(op, &p->entries[i], tokens,
-                                            replacements);
-
-            if (tmpfile != NULL) {
-                /* add this new file to the package */
-
-                /*
-                 * XXX 'name' is the basename (non-directory part) of
-                 * the file to be installed; normally, 'name' just
-                 * points into 'file', but in this case 'file' is
-                 * mkstemp(3)-generated, so doesn't have the same
-                 * basename; instead, we just strdup the name from the
-                 * template package entry; yes, 'name' will get leaked
-                 */
-
-                add_package_entry(p,
-                                  tmpfile,
-                                  p->entries[i].path,
-                                  nvstrdup(p->entries[i].name),
-                                  NULL, /* target */
-                                  NULL, /* dst */
-                                  FILE_TYPE_LIBGL_LA,
-                                  p->entries[i].compat_arch,
-                                  p->entries[i].mode);
-            }
-
-            nvfree(replacements[0]);
-        }
-    }
-
-    nvfree(replacements[1]);
-
-} /* process_libGL_la_files() */
-
-
-
-/*
  * process_dot_desktop_files() - for any .desktop files in the
  * package, copy them to a temporary file, replacing __UTILS_PATH__
  * and __PIXMAP_PATH__ as appropriate.  Then, add the new file to
diff --git a/files.h b/files.h
index 2c8fd18..7f7244a 100644
--- a/files.h
+++ b/files.h
@@ -56,7 +56,6 @@ int pack_precompiled_files(Options *op, Package *p, int num_files,
 
 char *process_template_file(Options *op, PackageEntry *pe,
                             char **tokens, char **replacements);
-void process_libGL_la_files(Options *op, Package *p);
 void process_dot_desktop_files(Options *op, Package *p);
 void process_dkms_conf(Options *op, Package *p);
 int set_security_context(Options *op, const char *filename, const char *type);
diff --git a/install-from-cwd.c b/install-from-cwd.c
index 2b46921..a686e1f 100644
--- a/install-from-cwd.c
+++ b/install-from-cwd.c
@@ -230,13 +230,12 @@ int install_from_cwd(Options *op)
         if (!get_prefixes(op)) goto failed;
 
         /*
-         * if the package contains any libGL.la or .desktop files,
+         * if the package contains any .desktop files,
          * process them (perform some search and replacing so
          * that they reflect the correct installation path, etc)
          * and add them to the package list (files to be installed).
          */
-        
-        process_libGL_la_files(op, p);
+
         process_dot_desktop_files(op, p);
 
 #if defined(NV_X86_64)
diff --git a/manifest.c b/manifest.c
index ff57293..f46897d 100644
--- a/manifest.c
+++ b/manifest.c
@@ -79,7 +79,6 @@ static const struct {
     { ENTRY(OPENCL_WRAPPER_LIB,         T, T, T, F, T, F, F, F, F) },
     { ENTRY(OPENCL_LIB_SYMLINK,         T, F, T, T, F, F, F, T, F) },
     { ENTRY(OPENCL_WRAPPER_SYMLINK,     T, F, T, T, F, F, F, F, F) },
-    { ENTRY(LIBGL_LA,                   T, T, F, F, F, T, T, T, F) },
     { ENTRY(TLS_LIB,                    T, T, T, F, T, T, F, T, F) },
     { ENTRY(UTILITY_LIB,                T, T, F, F, T, F, F, T, F) },
     { ENTRY(DOCUMENTATION,              F, T, T, F, F, F, F, T, F) },
@@ -125,6 +124,9 @@ static const struct {
     { ENTRY(FLEXERA_LIB,                F, T, T, F, T, F, F, F, F) },
     { ENTRY(FLEXERA_LIB_SYMLINK,        F, F, T, T, F, F, F, F, F) },
     { ENTRY(ALLOCATOR_JSON,             F, T, F, F, F, F, F, T, F) },
+    { ENTRY(INTERNAL_UTILITY_BINARY,    T, T, F, F, F, F, F, T, F) },
+    { ENTRY(INTERNAL_UTILITY_LIB,       T, T, F, F, T, F, F, T, F) },
+    { ENTRY(INTERNAL_UTILITY_DATA,      F, T, F, F, F, F, F, T, F) },
 };
 
 /*
diff --git a/nvidia-installer.h b/nvidia-installer.h
index c5bdda7..99049f6 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -105,7 +105,6 @@ typedef enum {
     FILE_TYPE_KERNEL_MODULE,
     FILE_TYPE_INSTALLER_BINARY,
     FILE_TYPE_UTILITY_BINARY,
-    FILE_TYPE_LIBGL_LA,
     FILE_TYPE_TLS_LIB,
     FILE_TYPE_UTILITY_LIB,
     FILE_TYPE_DOT_DESKTOP,
@@ -153,6 +152,9 @@ typedef enum {
     FILE_TYPE_FLEXERA_LIB,
     FILE_TYPE_FLEXERA_LIB_SYMLINK,
     FILE_TYPE_ALLOCATOR_JSON,
+    FILE_TYPE_INTERNAL_UTILITY_BINARY,
+    FILE_TYPE_INTERNAL_UTILITY_LIB,
+    FILE_TYPE_INTERNAL_UTILITY_DATA,
     FILE_TYPE_MAX
 } PackageEntryFileType;
 
diff --git a/version.mk b/version.mk
index 7a63ce9..38f9fbf 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 440.100
+NVIDIA_VERSION = 450.51