summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2011-08-07 21:18:27 (GMT)
committerBritney Fransen <brfransen@gmail.com>2011-08-07 21:18:27 (GMT)
commit5e35beb967efb7dc382daf41bb6328611a30c6ec (patch)
tree1882ff987a5024e2a49a61bb51c66b82b13fc1f0
parent205948382bf7c06bb74fdb88c1a81cd3c20d9031 (diff)
downloadlinhes_pkgbuild-5e35beb967efb7dc382daf41bb6328611a30c6ec.zip
linhes_pkgbuild-5e35beb967efb7dc382daf41bb6328611a30c6ec.tar.gz
linhes_pkgbuild-5e35beb967efb7dc382daf41bb6328611a30c6ec.tar.bz2
linhes-config: xconfig.sh: uninstall existing nvidia drivers to ensure correct driver is installed. refs #514
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/xconfig.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 4a4748d..faaefee 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.2
-pkgrel=28
+pkgrel=29
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -110,7 +110,7 @@ md5sums=('c737f8538aea20fcb5f3903957e80837'
'c20f73d4da5d7e15e1f3eb85c7dcb49a'
'8ac1cfd2eca0f641737da0d0aca416a7'
'9ae8d79f620c6d19973c55c32a921874'
- '266d48cc336c70e8967c5bb9f5e1787d'
+ '627f01898f8a9800bd3db11dfd5c3655'
'ecf9e5df20683a769c4a8a8f2d65de85'
'e459ed069317bccb20351f037a9df3d2'
'83be9a3bc72179909773479c74d13b38'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index d684c21..2543495 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -196,7 +196,7 @@ function setupAdvancedX {
}
function nvidia_prepare {
- pacman --noconfirm -Rdd libgl > /dev/null 2>&1
+ pacman --noconfirm -Rdd libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1
for i in `echo ${NVPKGS}`
do
echo $i