[arch-commits] Commit in nvidia/trunk (PKGBUILD nvidia.install)

[Pierre Schmitz]

    Date: Saturday, February 28, 2009 @ 12:40:39
  Author: pierre
Revision: 28266

upgpkg: nvidia 180.35-1
    update and cleanup

Modified:
  nvidia/trunk/PKGBUILD
  nvidia/trunk/nvidia.install

----------------+
 PKGBUILD       |   41 ++++++++++++++++++++---------------------
 nvidia.install |   21 ++++-----------------
 2 files changed, 24 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-28 17:38:04 UTC (rev 28265)
+++ PKGBUILD	2009-02-28 17:40:39 UTC (rev 28266)
@@ -2,7 +2,7 @@
 # Maintainer : Thomas Baechler <thomas at archlinux.org>
 
 pkgname=nvidia
-pkgver=180.22
+pkgver=180.35
 _kernver='2.6.28-ARCH'
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26."
@@ -11,28 +11,27 @@
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
 depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils')
-conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
-source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run)
-md5sums=('265a984e973bcf5a7c2feeba4b0927a9')
-[ "$CARCH" = "x86_64" ] && md5sums=('91a40e758b06429453d780932f51d6d9')
+source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
+md5sums=('23a4e1cbe24943452c82eeab9dd8200d')
+[ "$CARCH" = "x86_64" ] && md5sums=('451fdd8d5196a15aba424618ab16ed12')
 
-build()
-{
-  # Extract
-  cd $startdir/src/
-  sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
-  cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
-  
-  # Any extra patches are applied in here...
-  cd usr/src/nv/
-  ln -s Makefile.kbuild Makefile
-  make SYSSRC=/lib/modules/${_kernver}/build module || return 1
-  
-  # install kernel module
-  mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
-  install -m644 nvidia.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
+build() {
+	cd $srcdir
+	sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
+	cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
 
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
+	cd usr/src/nv/
+	ln -s Makefile.kbuild Makefile
+	make SYSSRC=/lib/modules/${_kernver}/build module || return 1
+
+	mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
+	install -m644 nvidia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
+
+	mkdir -p $pkgdir/usr/share/licenses/
+	ln -sf nvidia-utils $pkgdir/usr/share/licenses/nvidia || return 1
+
+	sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install
 }

Modified: nvidia.install
===================================================================
--- nvidia.install	2009-02-28 17:38:04 UTC (rev 28265)
+++ nvidia.install	2009-02-28 17:40:39 UTC (rev 28266)
@@ -1,22 +1,9 @@
-# arg 1:  the new package version
 post_install() {
-  KERNEL_VERSION='2.6.28-ARCH'
-  depmod -v $KERNEL_VERSION  > /dev/null 2>&1		 
+	KERNEL_VERSION='2.6.28-ARCH'
+	depmod $KERNEL_VERSION
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-  rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
-}
-
-# arg 1:  the old package version
 post_remove() {
-  KERNEL_VERSION='2.6.28-ARCH'
-  depmod -v $KERNEL_VERSION	 > /dev/null 2>&1	 
+	KERNEL_VERSION='2.6.28-ARCH'
+	depmod $KERNEL_VERSION
 }
-
-op=$1
-shift
-$op $*