From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5ACAA1384B4 for ; Sun, 6 Dec 2015 05:32:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9598221C051; Sun, 6 Dec 2015 05:32:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3CD0121C051 for ; Sun, 6 Dec 2015 05:32:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE35F3408A2 for ; Sun, 6 Dec 2015 05:32:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0D9EA3F for ; Sun, 6 Dec 2015 05:32:28 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1449379933.5b59b721ce933854d4f6191fc67536d0f5e0113a.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/, x11-drivers/nvidia-drivers/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ x11-drivers/nvidia-drivers/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 5b59b721ce933854d4f6191fc67536d0f5e0113a X-VCS-Branch: master Date: Sun, 6 Dec 2015 05:32:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 664b5c9a-14f8-48fc-8eef-75dc499cc61f X-Archives-Hash: 28e502e77f32f60bbee9e324ef99251d commit: 5b59b721ce933854d4f6191fc67536d0f5e0113a Author: Jeroen Roovers gentoo org> AuthorDate: Sun Dec 6 05:32:13 2015 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Dec 6 05:32:13 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b59b721 x11-drivers/nvidia-drivers: Unload nvidia-modeset as needed (bug #566242 by Adam Shea). Package-Manager: portage-2.2.26 x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf | 3 +++ .../{nvidia-drivers-358.16.ebuild => nvidia-drivers-358.16-r1.ebuild} | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf new file mode 100644 index 0000000..48a8273 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf @@ -0,0 +1,3 @@ +# Nvidia UVM support + +remove nvidia modprobe -r --ignore-remove nvidia-modeset nvidia-uvm nvidia diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild similarity index 99% rename from x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild index 44a9162..e81b1bc 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild @@ -244,7 +244,7 @@ src_install() { # pkg_preinst, see bug #491414 insinto /etc/modprobe.d newins "${FILESDIR}"/nvidia-169.07 nvidia.conf - use uvm && doins "${FILESDIR}"/nvidia-uvm.conf + doins "${FILESDIR}"/nvidia-rmmod.conf # Ensures that our device nodes are created when not using X exeinto "$(get_udevdir)"