summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorManuel Schneider2014-07-10 15:33:59 +0200
committerManuel Schneider2014-07-10 15:33:59 +0200
commit25d12b5fa6c1dd0db265da0e63c7b5a5333c5093 (patch)
tree9d5b842fdd032e69426f65777de46079b9f0866a /remote/modules
parent[pvs2] Adjusted module.build to build in /opt/openslx/bin (diff)
parentAdd option REQUIRED_ORIGINAL_USR_SPLIT to disable symlinking /bin to /usr/bin... (diff)
downloadtm-scripts-25d12b5fa6c1dd0db265da0e63c7b5a5333c5093.tar.gz
tm-scripts-25d12b5fa6c1dd0db265da0e63c7b5a5333c5093.tar.xz
tm-scripts-25d12b5fa6c1dd0db265da0e63c7b5a5333c5093.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/nvidia_libs/module.conf1
-rw-r--r--remote/modules/vmware/module.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/remote/modules/nvidia_libs/module.conf b/remote/modules/nvidia_libs/module.conf
index f54c114c..274b3d4d 100644
--- a/remote/modules/nvidia_libs/module.conf
+++ b/remote/modules/nvidia_libs/module.conf
@@ -1,6 +1,7 @@
REQUIRED_VERSION="331.38"
REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
+REQUIRED_ORIGINAL_USR_SPLIT="yes" # Don't symlink /bin to /usr/bin etc. in build dir
REQUIRED_FILES="
/etc/OpenCL/vendors/nvidia.icd
diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf
index 749a0838..42d73343 100644
--- a/remote/modules/vmware/module.conf
+++ b/remote/modules/vmware/module.conf
@@ -1,4 +1,5 @@
REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/"
+REQUIRED_ORIGINAL_USR_SPLIT="yes" # Don't symlink /bin to /usr/bin etc. in build dir
REQUIRED_TYPE="workstation"
REQUIRED_MODULES="kernel"
REQUIRED_DIRECTORIES="