diff options
| author | Christian Rößler | 2014-03-24 16:01:42 +0100 |
|---|---|---|
| committer | Christian Rößler | 2014-03-24 16:01:42 +0100 |
| commit | 395f941fda040b0f6b4350869ab6992af10e0977 (patch) | |
| tree | b5f181d699ecd8dca4a4045de99a37761246818d /remote/modules/nvidia_kernel | |
| parent | [vmware, chroot] vmware pseudo-deletions in case workstation is installed in (diff) | |
| parent | [kernel] remove forgotten pinfo used while dev'ing (diff) | |
| download | tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.tar.gz tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.tar.xz tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
remote/modules/vmware/vmware.build
Diffstat (limited to 'remote/modules/nvidia_kernel')
| -rw-r--r-- | remote/modules/nvidia_kernel/nvidia_kernel.build | 3 | ||||
| -rw-r--r-- | remote/modules/nvidia_kernel/nvidia_kernel.conf | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/remote/modules/nvidia_kernel/nvidia_kernel.build b/remote/modules/nvidia_kernel/nvidia_kernel.build index bde06c60..a1275c70 100644 --- a/remote/modules/nvidia_kernel/nvidia_kernel.build +++ b/remote/modules/nvidia_kernel/nvidia_kernel.build @@ -7,7 +7,6 @@ fetch_source() { build() { local ROOTUPPERDIR="$MODULE_DIR/rootupper" - local KERNELSRCDIR="$MODULES_DIR/kernel/ksrc" # kernel sources local NVIDIA="$MODULE_DIR/src/$REQUIRED_NVIDIA" local NVIDIAEXTRACTDIR="$ROOTUPPERDIR/NVIDIA" @@ -29,7 +28,7 @@ build() { chroot_run "$ROOTUPPERDIR" <<-EOF - /NVIDIA/nvidia-installer --no-nouveau-check --no-network --no-backup --no-rpms --no-runlevel-check --no-distro-scripts --no-cc-version-check --no-x-check --no-precompiled-interface --silent --kernel-source-path /"$KERNELSRCDIR" # Do the work! + /NVIDIA/nvidia-installer --no-nouveau-check --no-network --no-backup --no-rpms --no-runlevel-check --no-distro-scripts --no-cc-version-check --no-x-check --no-precompiled-interface --silent --kernel-source-path /"$KERNEL_HEADERS_PATH" # Do the work! # fake success since the installer will exit with an error due to the module not loading properly. exit 0 EOF diff --git a/remote/modules/nvidia_kernel/nvidia_kernel.conf b/remote/modules/nvidia_kernel/nvidia_kernel.conf index 34e66b99..9880100d 100644 --- a/remote/modules/nvidia_kernel/nvidia_kernel.conf +++ b/remote/modules/nvidia_kernel/nvidia_kernel.conf @@ -5,3 +5,6 @@ REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/ REQUIRED_DIRECTORIES=" /lib/modules/nvidia " +REQUIRED_MODULES=" + kernel +" |