forked from mirrors/nixpkgs
d6c2fe76ed
nvidia_x11 and persistenced were modified to provide binaries which can be mounted inside a docker-container to be executed there. most ldconfig-based discovery of bundled nvidia libraries is patched out ldconfig itself is patched to be able to deal with patchelf'ed libraries See https://sourceware.org/bugzilla/show_bug.cgi?id=23964
131 lines
5.3 KiB
Diff
131 lines
5.3 KiB
Diff
diff --git a/src/ldcache.c b/src/ldcache.c
|
|
index 38bab05..e1abc89 100644
|
|
--- a/src/ldcache.c
|
|
+++ b/src/ldcache.c
|
|
@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx)
|
|
|
|
int
|
|
ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[],
|
|
- char *paths[], size_t size, ldcache_select_fn select, void *select_ctx)
|
|
+ char *paths[], size_t size, const char* version)
|
|
{
|
|
char path[PATH_MAX];
|
|
- struct header_libc6 *h;
|
|
- int override;
|
|
+ char dir[PATH_MAX];
|
|
+ char lib[PATH_MAX];
|
|
|
|
- h = (struct header_libc6 *)ctx->ptr;
|
|
memset(paths, 0, size * sizeof(*paths));
|
|
|
|
- for (uint32_t i = 0; i < h->nlibs; ++i) {
|
|
- int32_t flags = h->libs[i].flags;
|
|
- char *key = (char *)ctx->ptr + h->libs[i].key;
|
|
- char *value = (char *)ctx->ptr + h->libs[i].value;
|
|
-
|
|
- if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch)
|
|
+ for (size_t j = 0; j < size; ++j) {
|
|
+ snprintf(dir, 100, "/run/opengl-driver%s/lib",
|
|
+ arch == LD_I386_LIB32 ? "-32" : "");
|
|
+ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100))
|
|
+ strcat(dir, "/vdpau");
|
|
+ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version);
|
|
+ if (path_resolve_full(ctx->err, path, "/", lib) < 0)
|
|
+ return (-1);
|
|
+ if (!file_exists(ctx->err, path))
|
|
continue;
|
|
-
|
|
- for (size_t j = 0; j < size; ++j) {
|
|
- if (!str_has_prefix(key, libs[j]))
|
|
- continue;
|
|
- if (path_resolve(ctx->err, path, root, value) < 0)
|
|
- return (-1);
|
|
- if (paths[j] != NULL && str_equal(paths[j], path))
|
|
- continue;
|
|
- if ((override = select(ctx->err, select_ctx, root, paths[j], path)) < 0)
|
|
- return (-1);
|
|
- if (override) {
|
|
- free(paths[j]);
|
|
- paths[j] = xstrdup(ctx->err, path);
|
|
- if (paths[j] == NULL)
|
|
- return (-1);
|
|
- }
|
|
- break;
|
|
- }
|
|
+ paths[j] = xstrdup(ctx->err, path);
|
|
+ if (paths[j] == NULL)
|
|
+ return (-1);
|
|
}
|
|
return (0);
|
|
}
|
|
diff --git a/src/ldcache.h b/src/ldcache.h
|
|
index 33d78dd..2b087db 100644
|
|
--- a/src/ldcache.h
|
|
+++ b/src/ldcache.h
|
|
@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *);
|
|
int ldcache_open(struct ldcache *);
|
|
int ldcache_close(struct ldcache *);
|
|
int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [],
|
|
- char *[], size_t, ldcache_select_fn, void *);
|
|
+ char *[], size_t, const char*);
|
|
|
|
#endif /* HEADER_LDCACHE_H */
|
|
diff --git a/src/nvc_info.c b/src/nvc_info.c
|
|
index cc96542..3fe7612 100644
|
|
--- a/src/nvc_info.c
|
|
+++ b/src/nvc_info.c
|
|
@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
|
|
if (path_resolve_full(err, path, root, ldcache) < 0)
|
|
return (-1);
|
|
ldcache_init(&ld, err, path);
|
|
- if (ldcache_open(&ld) < 0)
|
|
- return (-1);
|
|
|
|
info->nlibs = size;
|
|
info->libs = array_new(err, size);
|
|
if (info->libs == NULL)
|
|
goto fail;
|
|
if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
|
|
- info->libs, info->nlibs, select_libraries, info) < 0)
|
|
+ info->libs, info->nlibs, info->nvrm_version) < 0)
|
|
goto fail;
|
|
|
|
info->nlibs32 = size;
|
|
@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
|
|
if (info->libs32 == NULL)
|
|
goto fail;
|
|
if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
|
|
- info->libs32, info->nlibs32, select_libraries, info) < 0)
|
|
+ info->libs32, info->nlibs32, info->nvrm_version) < 0)
|
|
goto fail;
|
|
rv = 0;
|
|
|
|
fail:
|
|
- if (ldcache_close(&ld) < 0)
|
|
- return (-1);
|
|
return (rv);
|
|
}
|
|
|
|
@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r
|
|
char path[PATH_MAX];
|
|
int rv = -1;
|
|
|
|
- if ((env = secure_getenv("PATH")) == NULL) {
|
|
+ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) {
|
|
error_setx(err, "environment variable PATH not found");
|
|
return (-1);
|
|
}
|
|
diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c
|
|
index d41a24d..65b7878 100644
|
|
--- a/src/nvc_ldcache.c
|
|
+++ b/src/nvc_ldcache.c
|
|
@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
|
|
if (validate_args(ctx, cnt != NULL) < 0)
|
|
return (-1);
|
|
|
|
- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
|
|
+ argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
|
|
if (*argv[0] == '@') {
|
|
/*
|
|
* We treat this path specially to be relative to the host filesystem.
|