From 6c2c3083db8b0479747602bd92d567927d3e449a Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Tue, 6 Oct 2015 20:23:12 -0500 Subject: [PATCH] nvidia-sl: updated to version 355.11, updated kernel module locations --- nvidia-sl/.footprint | 60 +++++++++++++++++++++++--------------------- nvidia-sl/.md5sum | 2 +- nvidia-sl/Pkgfile | 12 +++------ 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/nvidia-sl/.footprint b/nvidia-sl/.footprint index a86153c1d..c9dc04f98 100644 --- a/nvidia-sl/.footprint +++ b/nvidia-sl/.footprint @@ -5,9 +5,11 @@ drwxr-xr-x root/root etc/OpenCL/vendors/ drwxr-xr-x root/root lib/ drwxr-xr-x root/root lib/modules/ drwxr-xr-x root/root lib/modules// -drwxr-xr-x root/root lib/modules//extra/ --rw-r--r-- root/root lib/modules//extra/nvidia-uvm.ko --rw-r--r-- root/root lib/modules//extra/nvidia.ko +drwxr-xr-x root/root lib/modules//kernel/ +drwxr-xr-x root/root lib/modules//kernel/drivers/ +drwxr-xr-x root/root lib/modules//kernel/drivers/video/ +-rw-r--r-- root/root lib/modules//kernel/drivers/video/nvidia-uvm.ko +-rw-r--r-- root/root lib/modules//kernel/drivers/video/nvidia.ko drwxr-xr-x root/root lib/udev/ drwxr-xr-x root/root lib/udev/rules.d/ -rw-r--r-- root/root lib/udev/rules.d/90-nvidia-uvm.rules @@ -19,41 +21,41 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/nvidia-smi -rwxr-xr-x root/root usr/bin/nvidia-xconfig drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libGL.so.349.16 -lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.349.16 +-rwxr-xr-x root/root usr/lib/libGL.so.355.11 +lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.355.11 lrwxrwxrwx root/root usr/lib/libOpenCL.so -> libOpenCL.so.1.0.0 -rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0 --rwxr-xr-x root/root usr/lib/libcuda.so.349.16 -lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.349.16 -lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.349.16 --rwxr-xr-x root/root usr/lib/libnvcuvid.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-encode.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.349.16 -lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.349.16 -lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-ml.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.349.16 --rwxr-xr-x root/root usr/lib/libnvidia-tls.so.349.16 +-rwxr-xr-x root/root usr/lib/libcuda.so.355.11 +lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.355.11 +lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvcuvid.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-encode.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.355.11 +lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.355.11 +lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-ml.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.355.11 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.355.11 drwxr-xr-x root/root usr/lib/tls/ --rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.349.16 +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.355.11 drwxr-xr-x root/root usr/lib/vdpau/ -lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.349.16 -lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.349.16 --rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.349.16 +lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.355.11 +lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.355.11 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.355.11 drwxr-xr-x root/root usr/lib/xorg/ drwxr-xr-x root/root usr/lib/xorg/modules/ drwxr-xr-x root/root usr/lib/xorg/modules/drivers/ -rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so drwxr-xr-x root/root usr/lib/xorg/modules/extensions/ --rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.349.16 -lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.349.16 --rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.349.16 +-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.355.11 +lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.355.11 +-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.355.11 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/nvidia-persistenced.1.gz diff --git a/nvidia-sl/.md5sum b/nvidia-sl/.md5sum index 82997f17a..4c8bf8675 100644 --- a/nvidia-sl/.md5sum +++ b/nvidia-sl/.md5sum @@ -1,2 +1,2 @@ 4511024cc556d0c6e7c467b6789524e2 90-nvidia-uvm.rules -3e04208affde8c35a8b96975eec0486b NVIDIA-Linux-x86_64-349.16-no-compat32.run +30133d89690f4683c4e289ec6c0247dc NVIDIA-Linux-x86_64-355.11-no-compat32.run diff --git a/nvidia-sl/Pkgfile b/nvidia-sl/Pkgfile index 778a50aad..9e4b48da5 100644 --- a/nvidia-sl/Pkgfile +++ b/nvidia-sl/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk gl-select name=nvidia-sl -version=349.16 +version=355.11 release=1 source=(http://us.download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run \ 90-nvidia-uvm.rules) @@ -74,13 +74,9 @@ build() { install -d $PKG/lib/udev/rules.d install -m 0644 $SRC/90-nvidia-uvm.rules $PKG/lib/udev/rules.d/90-nvidia-uvm.rules - # kernel module + # kernel modules cd kernel IGNORE_CC_MISMATCH=1 make module - install -D -m 0644 nvidia.ko $PKG/lib/modules/`uname -r`/extra/nvidia.ko - - # nvidia-uvm module - cd uvm - IGNORE_CC_MISMATCH=1 make module - install -D -m 0644 nvidia-uvm.ko $PKG/lib/modules/`uname -r`/extra/nvidia-uvm.ko + install -D -m 0644 nvidia.ko $PKG/lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko + install -D -m 0644 nvidia-uvm.ko $PKG/lib/modules/`uname -r`/kernel/drivers/video/nvidia-uvm.ko }