summaryrefslogtreecommitdiffstats
path: root/abs/core-testing
diff options
context:
space:
mode:
authorGreg Frost <gregfrost1@bigpond.com>2009-07-23 09:19:58 (GMT)
committerGreg Frost <gregfrost1@bigpond.com>2009-07-23 09:19:58 (GMT)
commit924dd7f92a9943a53c6cebf40886c2a900f87dd9 (patch)
tree5ee2a358dd3df1b5ad14bc139d513a1a96c29ffd /abs/core-testing
parent1b883c88ab15600f552e138e11e5df38d852dda3 (diff)
downloadlinhes_pkgbuild-924dd7f92a9943a53c6cebf40886c2a900f87dd9.zip
linhes_pkgbuild-924dd7f92a9943a53c6cebf40886c2a900f87dd9.tar.gz
linhes_pkgbuild-924dd7f92a9943a53c6cebf40886c2a900f87dd9.tar.bz2
LinHES-config: Bob's change to remove libgl when installing the nvidia drivers
Diffstat (limited to 'abs/core-testing')
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/xconfig.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 2b5aeac..e25e802 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.0
-pkgrel=61
+pkgrel=63
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo python-pexpect python-netifaces LinHES-timezone python-iplib)
diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh
index 008d45e..f90a60e 100755
--- a/abs/core-testing/LinHES-config/xconfig.sh
+++ b/abs/core-testing/LinHES-config/xconfig.sh
@@ -202,11 +202,13 @@ function setupX {
then
#install 96xx drivers
echo "installing nvidia 96xx drivers"
+ pacman --noconfirm -Rd libgl > /dev/null 2>&1
pacman --noconfirm -R $NVPKGS > /dev/null 2>&1
pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1
else
#install latest drivers
echo "installing current nvidia drivers"
+ pacman --noconfirm -Rd libgl > /dev/null 2>&1
pacman --noconfirm -R $NVPKGS > /dev/null 2>&1
pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1
fi