From 5e35beb967efb7dc382daf41bb6328611a30c6ec Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 7 Aug 2011 16:18:27 -0500 Subject: linhes-config: xconfig.sh: uninstall existing nvidia drivers to ensure correct driver is installed. refs #514 --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/xconfig.sh | 2 +- 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 -- cgit v0.12 From 23195fccf73e9cad668f812ee5a9c3158b20057d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 7 Aug 2011 17:52:57 -0500 Subject: linhes-config: xconfig.sh: fix cmd to uninstall nvidia drivers --- abs/core/LinHES-config/PKGBUILD | 4 ++-- 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 faaefee..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=29 +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' - '627f01898f8a9800bd3db11dfd5c3655' + 'ad2ba000decfc1e50533692f1793e620' 'ecf9e5df20683a769c4a8a8f2d65de85' 'e459ed069317bccb20351f037a9df3d2' '83be9a3bc72179909773479c74d13b38' diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index 2543495..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 nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils > /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 -- cgit v0.12 From a02ff025559a9b583ab4e52e6a83087c823c2af8 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Mon, 8 Aug 2011 21:48:16 +0000 Subject: nvidia-utils: update to 280.13 --- abs/core/nvidia-utils/PKGBUILD | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index faf12c9..4099d9f 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: James Rayner pkgbase=nvidia-utils pkgname=('nvidia-utils' 'opencl-nvidia') -pkgver=275.21 +pkgver=280.13 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -15,12 +15,10 @@ if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('8c0b4392c9222023d0827e2743c42d40') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('7568cd7a34634506bdfef9d9887de7ec') fi create_links() { @@ -106,4 +104,4 @@ package_nvidia-utils() { create_links } -md5sums=('8c0b4392c9222023d0827e2743c42d40') +md5sums=('c3992c8cef02b7773a398640d8830e77') -- cgit v0.12 From 59a5989953eff908ea42f588aa029c1b897f16a5 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Mon, 8 Aug 2011 21:48:35 +0000 Subject: nvidia: update to 280.13 --- abs/core/nvidia/PKGBUILD | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 688bc55..4d8dcb1 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer : Thomas Baechler pkgname=nvidia -pkgver=275.21 +pkgver=280.13 _kernver='2.6.39-LinHES' pkgrel=1 pkgdesc="NVIDIA drivers for kernel26." @@ -19,12 +19,10 @@ if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('8c0b4392c9222023d0827e2743c42d40') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('7568cd7a34634506bdfef9d9887de7ec') fi build() { @@ -42,4 +40,4 @@ package() { sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko" } -md5sums=('8c0b4392c9222023d0827e2743c42d40') +md5sums=('c3992c8cef02b7773a398640d8830e77') -- cgit v0.12