diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-07-01 06:41:32 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-07-01 06:41:32 +0100 |
commit | a73a7ed499e772424c3010e183d4fd835968192f (patch) | |
tree | 5cf42c3cb5bdcd96bce8a98f321448dc9e786375 | |
parent | b6cfe8d79d9d9b75fef613e47e7ebfbeb3ea0575 (diff) |
Revert "x11-drivers/nvidia-drivers : insert modprobe && udev rules when using dkms"
This reverts commit b6cfe8d79d9d9b75fef613e47e7ebfbeb3ea0575.
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-169.07 | 14 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf | 3 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-udev.sh-r1 | 20 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia.udev-rule | 6 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r2.ebuild) | 9 |
5 files changed, 0 insertions, 52 deletions
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07 deleted file mode 100644 index a96b0cd1..00000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-169.07 +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf deleted file mode 100644 index 618b9b30..00000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Nvidia UVM support - -remove nvidia modprobe -r --ignore-remove nvidia-drm nvidia-modeset nvidia-uvm nvidia diff --git a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh-r1 b/x11-drivers/nvidia-drivers/files/nvidia-udev.sh-r1 deleted file mode 100644 index 6579bf74..00000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh-r1 +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if [ $# -ne 1 ]; then - echo "Invalid args" >&2 - exit 1 -fi - -case $1 in - add|ADD) - #hopefully this prevents infinite loops like bug #454740 - if lsmod | grep -iq nvidia; then - /opt/bin/nvidia-smi > /dev/null - fi - ;; - remove|REMOVE) - rm -f /dev/nvidia* - ;; -esac - -exit 0 diff --git a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule b/x11-drivers/nvidia-drivers/files/nvidia.udev-rule deleted file mode 100644 index 2eb30bb0..00000000 --- a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule +++ /dev/null @@ -1,6 +0,0 @@ -ACTION=="add", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}" -# Previously the ACTION was "add|remove" but one user on bug #376527 had a -# problem until he recompiled udev-171-r5, which is one of the versions I -# tested with and it was fine. I'm breaking the rules out just to be safe -# so someone else doesn't have an issue -ACTION=="remove", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.ebuild index 072db58d..1d066de2 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.ebuild @@ -284,15 +284,6 @@ src_install() { exeinto "$(get_udevdir)" newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules - # Redcore Tweak : insert above modprobe && udev rules when using DKMS - elif use dkms && use kernel_linux; then - insinto /etc/modprobe.d - newins "${FILESDIR}"/nvidia-169.07 nvidia.conf - doins "${FILESDIR}"/nvidia-rmmod.conf - - exeinto "$(get_udevdir)" - newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh - udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules elif use kernel_FreeBSD; then if use x86-fbsd; then insinto /boot/modules |