summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2014-04-22 14:10:23 +0200
committerJonathan Bauer2014-04-22 14:10:23 +0200
commit8eec7ace0590ba96ac347def77d3f2ba4a0ba4d8 (patch)
treea54c667c0954c95032abfff1fef5036cf0721bf0
parent[pam] removed NCP for ub14.04 (TODO: fix it!) (diff)
parent[nvidia_libs] added ub14.04 conf + fix for version mismatch (diff)
downloadtm-scripts-8eec7ace0590ba96ac347def77d3f2ba4a0ba4d8.tar.gz
tm-scripts-8eec7ace0590ba96ac347def77d3f2ba4a0ba4d8.tar.xz
tm-scripts-8eec7ace0590ba96ac347def77d3f2ba4a0ba4d8.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
-rw-r--r--remote/modules/nvidia_libs/module.conf2
-rw-r--r--remote/modules/nvidia_libs/module.conf.ubuntu.14.0410
2 files changed, 11 insertions, 1 deletions
diff --git a/remote/modules/nvidia_libs/module.conf b/remote/modules/nvidia_libs/module.conf
index 12748274..f54c114c 100644
--- a/remote/modules/nvidia_libs/module.conf
+++ b/remote/modules/nvidia_libs/module.conf
@@ -4,7 +4,7 @@ REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/
REQUIRED_FILES="
/etc/OpenCL/vendors/nvidia.icd
- /usr/share/nvidia/nvidia-application-profiles-331.38-rc
+ /usr/share/nvidia/nvidia-application-profiles-$REQUIRED_VERSION-rc
/usr/share/applications/nvidia-settings.desktop
/opt/openslx/etc/nvidia.whiteout
"
diff --git a/remote/modules/nvidia_libs/module.conf.ubuntu.14.04 b/remote/modules/nvidia_libs/module.conf.ubuntu.14.04
new file mode 100644
index 00000000..98083b50
--- /dev/null
+++ b/remote/modules/nvidia_libs/module.conf.ubuntu.14.04
@@ -0,0 +1,10 @@
+REQUIRED_VERSION="337.12"
+REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
+REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
+REQUIRED_FILES="
+ /etc/OpenCL/vendors/nvidia.icd
+ /usr/share/nvidia/nvidia-application-profiles-$REQUIRED_VERSION-rc
+ /usr/share/applications/nvidia-settings.desktop
+ /opt/openslx/etc/nvidia.whiteout
+"
+