From 10a5f958d6de1c323a26a00c8462036063b3fb07 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Mon, 20 Feb 2012 18:36:14 +0000
Subject: [PATCH] extramodules: fix

---
 nvidia-173xx-lts/PKGBUILD       | 1 -
 nvidia-173xx-lts/nvidia.install | 3 +++
 nvidia-96xx-lts/PKGBUILD        | 1 -
 nvidia-96xx-lts/nvidia.install  | 3 +++
 nvidia-lts/PKGBUILD             | 1 -
 nvidia-lts/nvidia.install       | 3 +++
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nvidia-173xx-lts/PKGBUILD b/nvidia-173xx-lts/PKGBUILD
index b43d2c546..9c454c07b 100644
--- a/nvidia-173xx-lts/PKGBUILD
+++ b/nvidia-173xx-lts/PKGBUILD
@@ -36,7 +36,6 @@ package() {
     mkdir -p $pkgdir//lib/modules/${_extramodules}
     install -m644 nvidia.ko $pkgdir/lib/modules/${_extramodules}
     install -d -m755 "${pkgdir}/etc/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
 }
diff --git a/nvidia-173xx-lts/nvidia.install b/nvidia-173xx-lts/nvidia.install
index d0b81a582..e663036e0 100644
--- a/nvidia-173xx-lts/nvidia.install
+++ b/nvidia-173xx-lts/nvidia.install
@@ -2,14 +2,17 @@ post_install() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
+    echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
 }
 
 post_upgrade() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
 }
 
 post_remove() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    rm "/etc/modprobe.d/nouveau_blacklist.conf"
 }
diff --git a/nvidia-96xx-lts/PKGBUILD b/nvidia-96xx-lts/PKGBUILD
index 75173173d..f6a09e97b 100644
--- a/nvidia-96xx-lts/PKGBUILD
+++ b/nvidia-96xx-lts/PKGBUILD
@@ -37,7 +37,6 @@ package() {
     mkdir -p $pkgdir//lib/modules/${_extramodules}
     install -m644 nvidia.ko $pkgdir/lib/modules/${_extramodules}
     install -d -m755 "${pkgdir}/etc/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
 }
diff --git a/nvidia-96xx-lts/nvidia.install b/nvidia-96xx-lts/nvidia.install
index df01c81e6..bfa78b56f 100644
--- a/nvidia-96xx-lts/nvidia.install
+++ b/nvidia-96xx-lts/nvidia.install
@@ -2,14 +2,17 @@ post_install() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
+    echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
 }
 
 post_upgrade() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
 }
 
 post_remove() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    rm "/etc/modprobe.d/nouveau_blacklist.conf"
 }
\ No newline at end of file
diff --git a/nvidia-lts/PKGBUILD b/nvidia-lts/PKGBUILD
index 6bb092074..bf9dd2fc3 100644
--- a/nvidia-lts/PKGBUILD
+++ b/nvidia-lts/PKGBUILD
@@ -43,7 +43,6 @@ package() {
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
         "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
     install -d -m755 "${pkgdir}/etc/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
 }
diff --git a/nvidia-lts/nvidia.install b/nvidia-lts/nvidia.install
index d0b81a582..e663036e0 100644
--- a/nvidia-lts/nvidia.install
+++ b/nvidia-lts/nvidia.install
@@ -2,14 +2,17 @@ post_install() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
+    echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
 }
 
 post_upgrade() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
 }
 
 post_remove() {
     EXTRAMODULES='extramodules-3.0-CHAKRA-LTS'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    rm "/etc/modprobe.d/nouveau_blacklist.conf"
 }
-- 
GitLab