From 98c1aa8517c1ab98a585006879b0a8cb66a7d074 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 8 Jan 2015 16:13:32 +0100
Subject: [PATCH] nvidia*: always omit the drm dracut module, just in case.

* Regenerate all initramfs, not just for the running kernel.
* Move initramfs generation to the main pkg not -dkms.
---
 srcpkgs/nvidia-stable/template                             | 7 ++++++-
 .../{nvidia304/nvidia304-dkms.INSTALL => nvidia/INSTALL}   | 2 +-
 srcpkgs/{nvidia304/nvidia304-dkms.REMOVE => nvidia/REMOVE} | 2 +-
 srcpkgs/nvidia/template                                    | 7 ++++++-
 srcpkgs/{nvidia/nvidia-dkms.INSTALL => nvidia304/INSTALL}  | 0
 srcpkgs/{nvidia/nvidia-dkms.REMOVE => nvidia304/REMOVE}    | 0
 srcpkgs/nvidia304/template                                 | 7 ++++++-
 7 files changed, 20 insertions(+), 5 deletions(-)
 rename srcpkgs/{nvidia304/nvidia304-dkms.INSTALL => nvidia/INSTALL} (77%)
 rename srcpkgs/{nvidia304/nvidia304-dkms.REMOVE => nvidia/REMOVE} (77%)
 rename srcpkgs/{nvidia/nvidia-dkms.INSTALL => nvidia304/INSTALL} (100%)
 rename srcpkgs/{nvidia/nvidia-dkms.REMOVE => nvidia304/REMOVE} (100%)

diff --git a/srcpkgs/nvidia-stable/template b/srcpkgs/nvidia-stable/template
index d62f406520..00cd42baea 100644
--- a/srcpkgs/nvidia-stable/template
+++ b/srcpkgs/nvidia-stable/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
 
 pkgname=nvidia-stable
 version=340.65
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -153,6 +153,10 @@ do_install() {
 	vmkdir usr/lib/modprobe.d
 	echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
 	chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
+
+	# Omit drm dracut module too.
+	vmkdir usr/lib/dracut/dracut.conf.d
+	echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
 }
 
 nvidia-stable-dkms_package() {
@@ -166,6 +170,7 @@ nvidia-stable-dkms_package() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
 		vmove usr/lib/modprobe.d
+		vmove usr/lib/dracut
 	}
 }
 nvidia-stable-opencl_package() {
diff --git a/srcpkgs/nvidia304/nvidia304-dkms.INSTALL b/srcpkgs/nvidia/INSTALL
similarity index 77%
rename from srcpkgs/nvidia304/nvidia304-dkms.INSTALL
rename to srcpkgs/nvidia/INSTALL
index 51795d79e0..6b065bedb4 100644
--- a/srcpkgs/nvidia304/nvidia304-dkms.INSTALL
+++ b/srcpkgs/nvidia/INSTALL
@@ -2,6 +2,6 @@
 case ${ACTION} in
 post)
 	echo "Regenerating initramfs, please wait..."
-	dracut -f -q
+	dracut -f -q --regenerate-all
 	;;
 esac
diff --git a/srcpkgs/nvidia304/nvidia304-dkms.REMOVE b/srcpkgs/nvidia/REMOVE
similarity index 77%
rename from srcpkgs/nvidia304/nvidia304-dkms.REMOVE
rename to srcpkgs/nvidia/REMOVE
index c975fe0228..e4d494ca01 100644
--- a/srcpkgs/nvidia304/nvidia304-dkms.REMOVE
+++ b/srcpkgs/nvidia/REMOVE
@@ -2,6 +2,6 @@
 case ${ACTION} in
 purge)
 	echo "Regenerating initramfs, please wait..."
-	dracut -f -q
+	dracut -f -q --regenerate-all
 	;;
 esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 3b8cbb1115..9c8817a05a 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=343.36
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -153,6 +153,10 @@ do_install() {
 	vmkdir usr/lib/modprobe.d
 	echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
 	chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
+
+	# Omit drm dracut module too.
+	vmkdir usr/lib/dracut/dracut.conf.d
+	echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
 }
 
 nvidia-dkms_package() {
@@ -164,6 +168,7 @@ nvidia-dkms_package() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
 		vmove usr/lib/modprobe.d
+		vmove usr/lib/dracut
 	}
 }
 nvidia-opencl_package() {
diff --git a/srcpkgs/nvidia/nvidia-dkms.INSTALL b/srcpkgs/nvidia304/INSTALL
similarity index 100%
rename from srcpkgs/nvidia/nvidia-dkms.INSTALL
rename to srcpkgs/nvidia304/INSTALL
diff --git a/srcpkgs/nvidia/nvidia-dkms.REMOVE b/srcpkgs/nvidia304/REMOVE
similarity index 100%
rename from srcpkgs/nvidia/nvidia-dkms.REMOVE
rename to srcpkgs/nvidia304/REMOVE
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index 3260b53b34..f4f251c92d 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
 
 pkgname=nvidia304
 version=304.125
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -132,6 +132,10 @@ do_install() {
 	# opencl pkg
 	vinstall nvidia.icd 644 etc/OpenCL/vendors
 
+	# Omit drm dracut module too.
+	vmkdir usr/lib/dracut/dracut.conf.d
+	echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
+
 	vinstall libnvidia-compiler.so.${version} 755 usr/lib
 	ln -sf libnvidia-compiler.so.${version} \
 		${DESTDIR}/usr/lib/libnvidia-compiler.so
@@ -156,6 +160,7 @@ nvidia304-dkms_package() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
 		vmove usr/lib/modprobe.d
+		vmove usr/lib/dracut
 	}
 }
 nvidia304-opencl_package() {