diff options
| author | Simon Rettberg | 2015-12-03 14:41:20 +0100 |
|---|---|---|
| committer | root | 2015-12-03 14:41:20 +0100 |
| commit | a228359a9ca129fb8b84be93f1e1b8d67ef956b0 (patch) | |
| tree | de4cc257fc7db7ece5d27c54e5493ffbc72222e6 /remote | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-a228359a9ca129fb8b84be93f1e1b8d67ef956b0.tar.gz tm-scripts-a228359a9ca129fb8b84be93f1e1b8d67ef956b0.tar.xz tm-scripts-a228359a9ca129fb8b84be93f1e1b8d67ef956b0.zip | |
[nvidia*] Update drivers, handle new filenames/locations of built kernel modules
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/nvidia_kernel/module.build | 19 | ||||
| -rw-r--r-- | remote/modules/nvidia_kernel/module.conf | 2 | ||||
| -rw-r--r-- | remote/modules/nvidia_libs/module.conf | 2 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/templates/drm.cfg | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/remote/modules/nvidia_kernel/module.build b/remote/modules/nvidia_kernel/module.build index 648115c1..cbe38d6a 100644 --- a/remote/modules/nvidia_kernel/module.build +++ b/remote/modules/nvidia_kernel/module.build @@ -34,17 +34,18 @@ build() { EOF pinfo "chroot terminated." - pinfo "Stripping kernel modules..." - strip -g "$ROOTUPPERDIR/NVIDIA/kernel/nvidia.ko" || \ - pwarning "Could not strip kernel module $ROOTUPPERDIR/NVIDIA/kernel/nvidia.ko." - strip -g "$ROOTUPPERDIR/NVIDIA/kernel/uvm/nvidia-uvm.ko" || \ - pwarning "Could not strip kernel module $ROOTUPPERDIR/NVIDIA/kernel/uvm/nvidia-uvm.ko." - - pinfo "Copying kernel modules..." + local file + local RESULT local NVIDIA_MODULES="$MODULE_BUILD_DIR/lib/modules/nvidia/" mkdir -p "$NVIDIA_MODULES" - cp "$ROOTUPPERDIR/NVIDIA/kernel/nvidia.ko" "$NVIDIA_MODULES" || perror "Could not copy nvidia.ko!" - cp "$ROOTUPPERDIR/NVIDIA/kernel/uvm/nvidia-uvm.ko" "$NVIDIA_MODULES" || perror "Could not copy nvidia-uvm.ko!" + pinfo "Copying kernel modules..." + for file in nvidia.ko nvidia-uvm.ko nvidia-modeset.ko; do + RESULT=$(find "$ROOTUPPERDIR/NVIDIA/kernel" -name "$file" | head -n 1) + [ -z "$RESULT" ] && perror "Could not find built module $file in ./NVIDIA/kernel" + pinfo "Fetching ${file}..." + strip -g "$RESULT" || pwarning "Could not strip $file" + cp "$RESULT" "$NVIDIA_MODULES" || perror "Could not copy $file" + done rm -rf "$MODULE_BUILD_DIR/NVIDIA" } diff --git a/remote/modules/nvidia_kernel/module.conf b/remote/modules/nvidia_kernel/module.conf index f2409a1d..d04051b9 100644 --- a/remote/modules/nvidia_kernel/module.conf +++ b/remote/modules/nvidia_kernel/module.conf @@ -1,4 +1,4 @@ -REQUIRED_VERSION="352.41" +REQUIRED_VERSION="358.16" REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run" REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA" diff --git a/remote/modules/nvidia_libs/module.conf b/remote/modules/nvidia_libs/module.conf index af269dc0..a2f017ca 100644 --- a/remote/modules/nvidia_libs/module.conf +++ b/remote/modules/nvidia_libs/module.conf @@ -1,4 +1,4 @@ -REQUIRED_VERSION="352.41" +REQUIRED_VERSION="358.16" REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run" REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA" diff --git a/remote/rootfs/rootfs-stage31/templates/drm.cfg b/remote/rootfs/rootfs-stage31/templates/drm.cfg index d95ea31a..bbfa3bc0 100644 --- a/remote/rootfs/rootfs-stage31/templates/drm.cfg +++ b/remote/rootfs/rootfs-stage31/templates/drm.cfg @@ -15,5 +15,5 @@ # Dell GX 620 8086:2772 i915 # aliases -@nvidia nvidia/nvidia.ko nvidia/nvidia-uvm.ko +@nvidia nvidia/nvidia.ko nvidia/nvidia-uvm.ko nvidia/nvidia-modeset.ko @nvidia_fallback nouveau |