From ae3f733cc2892de5f5b747340962c652d8c43fe9 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 4 Sep 2010 22:50:53 -0700 Subject: nvidia:Bumped/Updated 173xx,96xx and latest for LinHES 7. --- abs/core-testing/nvidia-173xx-utils/20-nvidia.conf | 5 + abs/core-testing/nvidia-173xx-utils/PKGBUILD | 22 ++-- abs/core-testing/nvidia-173xx/PKGBUILD | 22 ++-- abs/core-testing/nvidia-173xx/nvidia.install | 4 +- abs/core-testing/nvidia-96xx/PKGBUILD | 9 +- abs/core-testing/nvidia-96xx/nvidia.install | 4 +- abs/core-testing/nvidia-utils/20-nvidia.conf | 1 - abs/core-testing/nvidia-utils/PKGBUILD | 143 ++++++++++----------- abs/core-testing/nvidia-utils/nvidia.install | 41 +----- abs/core-testing/nvidia/PKGBUILD | 37 +++--- abs/core-testing/nvidia/nvidia.install | 20 +-- 11 files changed, 139 insertions(+), 169 deletions(-) create mode 100644 abs/core-testing/nvidia-173xx-utils/20-nvidia.conf diff --git a/abs/core-testing/nvidia-173xx-utils/20-nvidia.conf b/abs/core-testing/nvidia-173xx-utils/20-nvidia.conf new file mode 100644 index 0000000..227ac7d --- /dev/null +++ b/abs/core-testing/nvidia-173xx-utils/20-nvidia.conf @@ -0,0 +1,5 @@ +Section "Device" + Identifier "Default nvidia Device" + Driver "nvidia" + Option "NoLogo" "True" +EndSection diff --git a/abs/core-testing/nvidia-173xx-utils/PKGBUILD b/abs/core-testing/nvidia-173xx-utils/PKGBUILD index 042c1ee..c16e97b 100644 --- a/abs/core-testing/nvidia-173xx-utils/PKGBUILD +++ b/abs/core-testing/nvidia-173xx-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69361 2010-02-20 11:24:49Z tpowa $ -# Maintainer: Thomas Baechler +# $Id: PKGBUILD 28365 2009-03-01 00:11:38Z pierre $ +# Maintainer: Thomas Bächler pkgname=nvidia-173xx-utils -pkgver=173.14.25 +pkgver=173.14.27 pkgrel=1 pkgdesc="NVIDIA drivers utilities and libraries, 173xx branch." arch=('i686' 'x86_64') @@ -16,9 +16,15 @@ provides=('libgl') license=('custom') install=nvidia.install options=(!strip) +backup=('etc/X11/xorg.conf.d/20-nvidia.conf') source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run") +md5sums=('35a6531f71cd6b070f10be8ed11093d4') +[ "$CARCH" = "x86_64" ] && md5sums=('269425dbc2d9d4ecdc54692281d6d738') -build() { +source[1]='20-nvidia.conf' +md5sums[1]='37e417b2c69e46de1346a653e07027fa' + +package() { cd $srcdir sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run --extract-only cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/ @@ -51,12 +57,12 @@ build() { ln -s libglx.so.$pkgver libglx.so || return 1 install -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $pkgdir/usr/share/licenses/nvidia-173xx/ || return 1 - ln -s nvidia-173xx $startdir/pkg/usr/share/licenses/nvidia-173xx-utils || return 1 + ln -s nvidia-173xx $pkgdir/usr/share/licenses/nvidia-173xx-utils || return 1 install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia-173xx/README || return 1 find $pkgdir/usr -type d -exec chmod 755 {} \; -} - -md5sums=('397bac51f760505ea57e863c1db9c572') + # Install xorg.conf.d file for nvidia autodetection in xorg.conf-less configurations + install -D -m644 $srcdir/20-nvidia.conf $pkgdir/etc/X11/xorg.conf.d/20-nvidia.conf +} diff --git a/abs/core-testing/nvidia-173xx/PKGBUILD b/abs/core-testing/nvidia-173xx/PKGBUILD index 845e606..83d4b8d 100644 --- a/abs/core-testing/nvidia-173xx/PKGBUILD +++ b/abs/core-testing/nvidia-173xx/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 69360 2010-02-20 11:24:15Z tpowa $ +# $Id: PKGBUILD 28363 2009-03-01 00:06:27Z pierre $ # Maintainer : Thomas Baechler pkgname=nvidia-173xx -pkgver=173.14.25 -_kernver='2.6.28-LinHES' - +pkgver=173.14.27 +_kernver='2.6.34-LinHES' pkgrel=1 pkgdesc="NVIDIA drivers for kernel26, 173xx branch." arch=('i686' 'x86_64') [ "$CARCH" = "i686" ] && ARCH=x86 [ "$CARCH" = "x86_64" ] && ARCH=x86_64 url="http://www.nvidia.com/" -depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-173xx-utils') -makedepends=('kernel-headers>=2.6.28' 'kernel-headers<2.6.29') -conflicts=('nvidia' 'nvidia-173xx') +depends=('kernel26>=2.6.34' 'kernel26<2.6.35' 'nvidia-173xx-utils') +makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35') +conflicts=('nvidia-96xx' 'nvidia') license=('custom') install=nvidia.install source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run") +md5sums=('35a6531f71cd6b070f10be8ed11093d4') +[ "$CARCH" = "x86_64" ] && md5sums=('269425dbc2d9d4ecdc54692281d6d738') build() { cd $srcdir @@ -25,10 +26,13 @@ build() { cd usr/src/nv/ ln -s Makefile.kbuild Makefile make SYSSRC=/lib/modules/${_kernver}/build module || return 1 +} +package() { + cd $srcdir/NVIDIA-Linux-$ARCH-${pkgver}-pkg0/usr/src/nv/ mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/ install -m644 nvidia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/ - + mkdir -p $pkgdir/etc/modprobe.d + echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf || return 1 sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install } -md5sums=('397bac51f760505ea57e863c1db9c572') diff --git a/abs/core-testing/nvidia-173xx/nvidia.install b/abs/core-testing/nvidia-173xx/nvidia.install index ab86ea2..a7e09f9 100644 --- a/abs/core-testing/nvidia-173xx/nvidia.install +++ b/abs/core-testing/nvidia-173xx/nvidia.install @@ -1,5 +1,5 @@ post_install() { - KERNEL_VERSION='2.6.28-LinHES' + KERNEL_VERSION='2.6.34-LinHES' depmod $KERNEL_VERSION } @@ -9,6 +9,6 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.28-LinHES' + KERNEL_VERSION='2.6.34-LinHES' depmod $KERNEL_VERSION } diff --git a/abs/core-testing/nvidia-96xx/PKGBUILD b/abs/core-testing/nvidia-96xx/PKGBUILD index df89e5f..78cd2ca 100644 --- a/abs/core-testing/nvidia-96xx/PKGBUILD +++ b/abs/core-testing/nvidia-96xx/PKGBUILD @@ -3,16 +3,17 @@ pkgname=nvidia-96xx pkgver=96.43.16 -_kernver='2.6.28-LinHES' +_kernver='2.6.34-LinHES' -pkgrel=1 +pkgrel=2 pkgdesc="NVIDIA drivers for kernel26, 96xx branch." arch=('i686' 'x86_64') [ "$CARCH" = "i686" ] && ARCH=x86 [ "$CARCH" = "x86_64" ] && ARCH=x86_64 url="http://www.nvidia.com/" -depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-96xx-utils') -makedepends=('kernel-headers>=2.6.28' 'kernel-headers<2.6.29') +#depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-96xx-utils') +depends=('kernel26' 'nvidia-96xx-utils') +makedepends=('kernel-headers') conflicts=('nvidia' 'nvidia-173xx') license=('custom') install=nvidia.install diff --git a/abs/core-testing/nvidia-96xx/nvidia.install b/abs/core-testing/nvidia-96xx/nvidia.install index ab86ea2..a7e09f9 100644 --- a/abs/core-testing/nvidia-96xx/nvidia.install +++ b/abs/core-testing/nvidia-96xx/nvidia.install @@ -1,5 +1,5 @@ post_install() { - KERNEL_VERSION='2.6.28-LinHES' + KERNEL_VERSION='2.6.34-LinHES' depmod $KERNEL_VERSION } @@ -9,6 +9,6 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.28-LinHES' + KERNEL_VERSION='2.6.34-LinHES' depmod $KERNEL_VERSION } diff --git a/abs/core-testing/nvidia-utils/20-nvidia.conf b/abs/core-testing/nvidia-utils/20-nvidia.conf index 171f613..227ac7d 100644 --- a/abs/core-testing/nvidia-utils/20-nvidia.conf +++ b/abs/core-testing/nvidia-utils/20-nvidia.conf @@ -3,4 +3,3 @@ Section "Device" Driver "nvidia" Option "NoLogo" "True" EndSection - diff --git a/abs/core-testing/nvidia-utils/PKGBUILD b/abs/core-testing/nvidia-utils/PKGBUILD index 88c2709..369253c 100644 --- a/abs/core-testing/nvidia-utils/PKGBUILD +++ b/abs/core-testing/nvidia-utils/PKGBUILD @@ -18,93 +18,92 @@ options=('!strip') backup=('etc/X11/xorg.conf.d/20-nvidia.conf') if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('f6af8917a500de28396a438f3f548c88') + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('f6af8917a500de28396a438f3f548c88') elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('7b5924f14a4d2326b4d916efdb7852ff') + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('7b5924f14a4d2326b4d916efdb7852ff') fi source[1]='20-nvidia.conf' -md5sums[1]='a3ddac4732c06d5cec7aefeed4d719c3' +md5sums[1]='37e417b2c69e46de1346a653e07027fa' build() { - cd $srcdir - sh ${_pkg}.run --extract-only + cd $srcdir + sh ${_pkg}.run --extract-only } package() { - cd $srcdir/${_pkg} + cd $srcdir/${_pkg} - # X driver - install -D -m755 nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers/nvidia_drv.so - # GLX extension module for X - install -D -m755 libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions/libglx.so.$pkgver - ln -s libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions/libglx.so # X doesn't find glx otherwise - # OpenGL library - install -D -m755 libGL.so.$pkgver $pkgdir/usr/lib/libGL.so.$pkgver - # OpenGL core library - install -D -m755 libnvidia-glcore.so.$pkgver $pkgdir/usr/lib/libnvidia-glcore.so.$pkgver - # XvMC - install -D -m644 libXvMCNVIDIA.a $pkgdir/usr/lib/libXvMCNVIDIA.a - install -D -m755 libXvMCNVIDIA.so.$pkgver $pkgdir/usr/lib/libXvMCNVIDIA.so.$pkgver - # VDPAU - install -D -m755 libvdpau_nvidia.so.$pkgver $pkgdir/usr/lib/vdpau/libvdpau_nvidia.so.$pkgver - # CUDA - install -D -m755 libcuda.so.$pkgver $pkgdir/usr/lib/libcuda.so.$pkgver - install -D -m644 cuda.h $pkgdir/usr/include/cuda/cuda.h - install -D -m644 cudaGL.h $pkgdir/usr/include/cuda/cudaGL.h - install -D -m644 cudaVDPAU.h $pkgdir/usr/include/cuda/cudaVDPAU.h - # nvidia-tls libraries - install -D -m755 libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver - install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/tls/libnvidia-tls.so.$pkgver - # OpenCL - install -D -m755 libnvidia-compiler.so.$pkgver $pkgdir/usr/lib/libnvidia-compiler.so.$pkgver - install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0 - install -D -m644 cl.h $pkgdir/usr/include/CL/cl.h - install -D -m644 cl_gl.h $pkgdir/usr/include/CL/cl_gl.h - install -D -m644 nvidia.icd $pkgdir/etc/OpenCL/vendors/nvidia.icd - install -D -m644 cl_platform.h $pkgdir/usr/include/CL/cl_platform.h + # X driver + install -D -m755 nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers/nvidia_drv.so + # GLX extension module for X + install -D -m755 libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions/libglx.so.$pkgver + ln -s libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions/libglx.so # X doesn't find glx otherwise + # OpenGL library + install -D -m755 libGL.so.$pkgver $pkgdir/usr/lib/libGL.so.$pkgver + # OpenGL core library + install -D -m755 libnvidia-glcore.so.$pkgver $pkgdir/usr/lib/libnvidia-glcore.so.$pkgver + # XvMC + install -D -m644 libXvMCNVIDIA.a $pkgdir/usr/lib/libXvMCNVIDIA.a + install -D -m755 libXvMCNVIDIA.so.$pkgver $pkgdir/usr/lib/libXvMCNVIDIA.so.$pkgver + # VDPAU + install -D -m755 libvdpau_nvidia.so.$pkgver $pkgdir/usr/lib/vdpau/libvdpau_nvidia.so.$pkgver + # CUDA + install -D -m755 libcuda.so.$pkgver $pkgdir/usr/lib/libcuda.so.$pkgver + install -D -m644 cuda.h $pkgdir/usr/include/cuda/cuda.h + install -D -m644 cudaGL.h $pkgdir/usr/include/cuda/cudaGL.h + install -D -m644 cudaVDPAU.h $pkgdir/usr/include/cuda/cudaVDPAU.h + # nvidia-tls libraries + install -D -m755 libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver + install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/tls/libnvidia-tls.so.$pkgver + # OpenCL + install -D -m755 libnvidia-compiler.so.$pkgver $pkgdir/usr/lib/libnvidia-compiler.so.$pkgver + install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0 + install -D -m644 cl.h $pkgdir/usr/include/CL/cl.h + install -D -m644 cl_gl.h $pkgdir/usr/include/CL/cl_gl.h + install -D -m644 nvidia.icd $pkgdir/etc/OpenCL/vendors/nvidia.icd + install -D -m644 cl_platform.h $pkgdir/usr/include/CL/cl_platform.h - install -D -m755 libnvidia-cfg.so.$pkgver $pkgdir/usr/lib/libnvidia-cfg.so.$pkgver + install -D -m755 libnvidia-cfg.so.$pkgver $pkgdir/usr/lib/libnvidia-cfg.so.$pkgver - # create soname links - for _lib in $(find $pkgdir -name '*.so*'); do - _soname="$(dirname ${_lib})/$(readelf -d "$_lib" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')" - if [ ! -e "${_soname}" ]; then - ln -s "$(basename ${_lib})" "${_soname}" - ln -s "$(basename ${_soname})" "${_soname/.[0-9]*/}" - fi - done + # create soname links + for _lib in $(find $pkgdir -name '*.so*'); do + _soname="$(dirname ${_lib})/$(readelf -d "$_lib" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')" + if [ ! -e "${_soname}" ]; then + ln -s "$(basename ${_lib})" "${_soname}" + ln -s "$(basename ${_soname})" "${_soname/.[0-9]*/}" + fi + done - # nvidia-xconfig - install -D -m755 nvidia-xconfig $pkgdir/usr/bin/nvidia-xconfig - install -D -m644 nvidia-xconfig.1.gz $pkgdir/usr/share/man/man1/nvidia-xconfig.1.gz - # nvidia-settings - install -D -m755 nvidia-settings $pkgdir/usr/bin/nvidia-settings - install -D -m644 nvidia-settings.1.gz $pkgdir/usr/share/man/man1/nvidia-settings.1.gz - install -D -m644 nvidia-settings.desktop $pkgdir/usr/share/applications/nvidia-settings.desktop - install -D -m644 nvidia-settings.png $pkgdir/usr/share/pixmaps/nvidia-settings.png - sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $pkgdir/usr/share/applications/nvidia-settings.desktop - # nvidia-bug-report - install -D -m755 nvidia-bug-report.sh $pkgdir/usr/bin/nvidia-bug-report.sh - # nvidia-smi - install -D -m755 nvidia-smi $pkgdir/usr/bin/nvidia-smi - install -D -m644 nvidia-smi.1.gz $pkgdir/usr/share/man/man1/nvidia-smi.1.gz + # nvidia-xconfig + install -D -m755 nvidia-xconfig $pkgdir/usr/bin/nvidia-xconfig + install -D -m644 nvidia-xconfig.1.gz $pkgdir/usr/share/man/man1/nvidia-xconfig.1.gz + # nvidia-settings + install -D -m755 nvidia-settings $pkgdir/usr/bin/nvidia-settings + install -D -m644 nvidia-settings.1.gz $pkgdir/usr/share/man/man1/nvidia-settings.1.gz + install -D -m644 nvidia-settings.desktop $pkgdir/usr/share/applications/nvidia-settings.desktop + install -D -m644 nvidia-settings.png $pkgdir/usr/share/pixmaps/nvidia-settings.png + sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $pkgdir/usr/share/applications/nvidia-settings.desktop + # nvidia-bug-report + install -D -m755 nvidia-bug-report.sh $pkgdir/usr/bin/nvidia-bug-report.sh + # nvidia-smi + install -D -m755 nvidia-smi $pkgdir/usr/bin/nvidia-smi + install -D -m644 nvidia-smi.1.gz $pkgdir/usr/share/man/man1/nvidia-smi.1.gz - install -D -m644 LICENSE $pkgdir/usr/share/licenses/nvidia/LICENSE - ln -s nvidia $pkgdir/usr/share/licenses/nvidia-utils - install -D -m644 README.txt $pkgdir/usr/share/doc/nvidia/README - install -D -m644 NVIDIA_Changelog $pkgdir/usr/share/doc/nvidia/NVIDIA_Changelog - ln -s nvidia $pkgdir/usr/share/doc/nvidia-utils + install -D -m644 LICENSE $pkgdir/usr/share/licenses/nvidia/LICENSE + ln -s nvidia $pkgdir/usr/share/licenses/nvidia-utils + install -D -m644 README.txt $pkgdir/usr/share/doc/nvidia/README + install -D -m644 NVIDIA_Changelog $pkgdir/usr/share/doc/nvidia/NVIDIA_Changelog + ln -s nvidia $pkgdir/usr/share/doc/nvidia-utils - # Install xorg.conf.d file for nvidia autodetection in xorg.conf-less configurations - install -D -m644 $srcdir/20-nvidia.conf $pkgdir/etc/X11/xorg.conf.d/20-nvidia.conf + # Install xorg.conf.d file for nvidia autodetection in xorg.conf-less configurations + install -D -m644 $srcdir/20-nvidia.conf $pkgdir/etc/X11/xorg.conf.d/20-nvidia.conf } - diff --git a/abs/core-testing/nvidia-utils/nvidia.install b/abs/core-testing/nvidia-utils/nvidia.install index 7d46ed6..297e5b6 100644 --- a/abs/core-testing/nvidia-utils/nvidia.install +++ b/abs/core-testing/nvidia-utils/nvidia.install @@ -1,40 +1,5 @@ -# arg 1: the new package version post_install() { - - echo ------------------------------- - echo By using this package you accept the NVIDIA license, - echo which has been installed in /usr/share/licenses/nvidia/LICENSE - echo If you do not accept this license, you must remove the package immediately. - echo Dont forget to update your /etc/X11/xorg.conf - echo In order to use nvidia-settings, you need to install the 'gtk2' package. - echo In order to use nvidia-xconfig, you need to install the 'pkgconfig' package. - echo ------------------------------- - echo nvidia 9746 drops support for Geforce 3 and 4 cards - echo If you have such a card, install the nvidia-96xx, nvidia-96xx-utils, - echo nvidia-96xx-ck, nvidia-96xx-beyond, nvidia-96xx-suspend2 packages - echo For a list of supported cards, see /usr/share/doc/nvidia/supported-cards.txt - echo ------------------------------- - - #echo ":: Updating symlinks to use built-in libwfb" - #ln -sf /usr/lib/xorg/modules/libnvidia-wfb.so.* \ - # /usr/lib/xorg/modules/libwfb.so + echo 'By using this package you accept the NVIDIA license,' + echo 'which has been installed in /usr/share/licenses/nvidia/LICENSE' + echo 'If you do not accept this license, you must remove the package immediately.' } - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 - echo ":: Updating symlinks to use xorg-server libwfb" - ln -sf /usr/lib/xorg/modules/libwfb.so.* \ - /usr/lib/xorg/modules/libwfb.so -} - -post_remove() { - echo ":: Updating symlinks to use xorg-server libwfb" - ln -sf /usr/lib/xorg/modules/libwfb.so.* \ - /usr/lib/xorg/modules/libwfb.so -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD index ca1d20f..40e9bba 100644 --- a/abs/core-testing/nvidia/PKGBUILD +++ b/abs/core-testing/nvidia/PKGBUILD @@ -3,41 +3,40 @@ pkgname=nvidia pkgver=256.35 -_kernver='2.6.28-LinHES' +_kernver='2.6.34-LinHES' pkgrel=1 pkgdesc="NVIDIA drivers for kernel26." arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('kernel26>=2.6.28' 'kernel26<2.6.29' "nvidia-utils=${pkgver}") -makedepends=('kernel-headers>=2.6.28' 'kernel-headers<2.6.29') +depends=('kernel26>=2.6.34' 'kernel26<2.6.35' "nvidia-utils=${pkgver}") +makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35') conflicts=('nvidia-96xx' 'nvidia-173xx') license=('custom') install=nvidia.install if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('f6af8917a500de28396a438f3f548c88') + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('f6af8917a500de28396a438f3f548c88') elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('7b5924f14a4d2326b4d916efdb7852ff') + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('7b5924f14a4d2326b4d916efdb7852ff') fi build() { - cd $srcdir - sh ${_pkg}.run --extract-only - cd ${_pkg}/kernel - make SYSSRC=/lib/modules/${_kernver}/build module + cd $srcdir + sh ${_pkg}.run --extract-only + cd ${_pkg}/kernel + make SYSSRC=/lib/modules/${_kernver}/build module } package() { - install -D -m644 $srcdir/${_pkg}/kernel/nvidia.ko \ - $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko + install -D -m644 $srcdir/${_pkg}/kernel/nvidia.ko \ + $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko install -d -m755 $pkgdir/etc/modprobe.d echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install + sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install } - diff --git a/abs/core-testing/nvidia/nvidia.install b/abs/core-testing/nvidia/nvidia.install index 23e04af..a7e09f9 100644 --- a/abs/core-testing/nvidia/nvidia.install +++ b/abs/core-testing/nvidia/nvidia.install @@ -1,22 +1,14 @@ -# arg 1: the new package version post_install() { - KERNEL_VERSION='2.6.28-LinHES' - depmod -v $KERNEL_VERSION > /dev/null 2>&1 + KERNEL_VERSION='2.6.34-LinHES' + 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.' + post_install + 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-LinHES' - depmod -v $KERNEL_VERSION > /dev/null 2>&1 + KERNEL_VERSION='2.6.34-LinHES' + depmod $KERNEL_VERSION } - -op=$1 -shift -$op $* -- cgit v0.12