319.60319.60

4 files changed, 18 insertions, 10 deletions

diff --git a/files.c b/files.c
index b4f4829..50ac47e 100644
--- a/files.c
+++ b/files.c
@@ -1004,6 +1004,7 @@ int add_kernel_module_to_package(Options *op, Package *p)
                       dst,
                       FILE_TYPE_KERNEL_MODULE,
                       FILE_TLS_CLASS_NONE,
+                      FILE_COMPAT_ARCH_NONE,
                       0644);
 
     return TRUE;
@@ -1987,6 +1988,7 @@ void process_libGL_la_files(Options *op, Package *p)
                                   NULL, /* dst */
                                   FILE_TYPE_LIBGL_LA,
                                   p->entries[i].tls_class,
+                                  p->entries[i].compat_arch,
                                   p->entries[i].mode);
             }
 
@@ -2062,6 +2064,7 @@ void process_dot_desktop_files(Options *op, Package *p)
                                   NULL, /* dst */
                                   FILE_TYPE_DOT_DESKTOP,
                                   p->entries[i].tls_class,
+                                  p->entries[i].compat_arch,
                                   p->entries[i].mode);
             }
         }
diff --git a/install-from-cwd.c b/install-from-cwd.c
index c2d9a0d..d618bd9 100644
--- a/install-from-cwd.c
+++ b/install-from-cwd.c
@@ -852,6 +852,7 @@ void add_package_entry(Package *p,
                        char *dst,
                        PackageEntryFileType type,
                        PackageEntryFileTlsClass tls_class,
+                       PackageEntryFileCompatArch compat_arch,
                        mode_t mode)
 {
     int n;
@@ -864,15 +865,16 @@ void add_package_entry(Package *p,
 
     memset(&p->entries[n], 0, sizeof(PackageEntry));
 
-    p->entries[n].file      = file;
-    p->entries[n].path      = path;
-    p->entries[n].name      = name;
-    p->entries[n].target    = target;
-    p->entries[n].dst       = dst;
-    p->entries[n].type      = type;
-    p->entries[n].tls_class = tls_class;
-    p->entries[n].mode      = mode;
-    p->entries[n].caps      = get_file_type_capabilities(type);
+    p->entries[n].file        = file;
+    p->entries[n].path        = path;
+    p->entries[n].name        = name;
+    p->entries[n].target      = target;
+    p->entries[n].dst         = dst;
+    p->entries[n].type        = type;
+    p->entries[n].tls_class   = tls_class;
+    p->entries[n].mode        = mode;
+    p->entries[n].caps        = get_file_type_capabilities(type);
+    p->entries[n].compat_arch = compat_arch;
 
     if (stat(p->entries[n].file, &stat_buf) != -1) {
         p->entries[n].inode = stat_buf.st_ino;
@@ -1206,6 +1208,7 @@ guess_fail:
                           NULL, /* dst */
                           FILE_TYPE_MODULE_SIGNING_KEY,
                           FILE_TLS_CLASS_NONE,
+                          FILE_COMPAT_ARCH_NONE,
                           0444);
 
         ui_message(op, "An X.509 certificate containing the public signing "
@@ -1238,6 +1241,7 @@ guess_fail:
                               NULL, /* dst */
                               FILE_TYPE_MODULE_SIGNING_KEY,
                               FILE_TLS_CLASS_NONE,
+                              FILE_COMPAT_ARCH_NONE,
                               0400);
 
             ui_message(op, "The private signing key will be installed to %s/%s. "
diff --git a/nvidia-installer.h b/nvidia-installer.h
index 9fb6749..b1bed8b 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -497,6 +497,7 @@ void add_package_entry(Package *p,
                        char *dst,
                        PackageEntryFileType type,
                        PackageEntryFileTlsClass tls_class,
+                       PackageEntryFileCompatArch compat_arch,
                        mode_t mode);
 /* XXX */
 
diff --git a/version.mk b/version.mk
index b483dd1..8768990 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 319.49
+NVIDIA_VERSION = 319.60