diff options
| author | Cecil <knoppmyth@gmail.com> | 2011-08-08 22:21:49 (GMT) |
|---|---|---|
| committer | Cecil <knoppmyth@gmail.com> | 2011-08-08 22:21:49 (GMT) |
| commit | b7ae82a691d8e8130c6456723fc6a96a35b95ea4 (patch) | |
| tree | 82893d3ec8fc98559ec86779749b42a924b1bc2d /abs/core/LinHES-config | |
| parent | 5bfe3063da38b2ad4d7d5695a72fdad2961932bd (diff) | |
| parent | 59a5989953eff908ea42f588aa029c1b897f16a5 (diff) | |
| download | linhes_pkgbuild-b7ae82a691d8e8130c6456723fc6a96a35b95ea4.zip linhes_pkgbuild-b7ae82a691d8e8130c6456723fc6a96a35b95ea4.tar.gz linhes_pkgbuild-b7ae82a691d8e8130c6456723fc6a96a35b95ea4.tar.bz2 | |
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/LinHES-config')
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/xconfig.sh | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 4a4748d..389ca0d 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=30 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' + 'ad2ba000decfc1e50533692f1793e620' 'ecf9e5df20683a769c4a8a8f2d65de85' 'e459ed069317bccb20351f037a9df3d2' '83be9a3bc72179909773479c74d13b38' diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index d684c21..11aedf5 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -196,7 +196,12 @@ function setupAdvancedX { } function nvidia_prepare { - pacman --noconfirm -Rdd libgl > /dev/null 2>&1 + for i in libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils + do + echo "Removing $i" + pacman --noconfirm -Rdd $i > /dev/null 2>&1 + done + for i in `echo ${NVPKGS}` do echo $i |