diff options
| -rw-r--r-- | abs/core/nvidia/PKGBUILD | 36 | ||||
| -rw-r--r-- | abs/core/nvidia/nvidia.install | 12 |
2 files changed, 23 insertions, 25 deletions
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 108f5c2..d5fef36 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -1,16 +1,15 @@ -# $Id$ +# $Id: PKGBUILD 163878 2012-07-21 12:01:30Z tpowa $ # Maintainer : Thomas Baechler <thomas@archlinux.org> pkgname=nvidia -pkgver=295.20 -#_extramodules=extramodules-2.6.39-LinHES -_kernver='2.6.39-LinHES' -pkgrel=1 +pkgver=302.17 +_extramodules=extramodules-3.4-ARCH +pkgrel=4 pkgdesc="NVIDIA drivers for linux." arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('kernel26>=2.6.39' 'kernel26<2.6.40' "nvidia-utils=${pkgver}") -makedepends=('kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40') +depends=('linux>=3.4' 'linux<3.5' "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.4' 'linux-headers<3.5') conflicts=('nvidia-96xx' 'nvidia-173xx') license=('custom') install=nvidia.install @@ -20,29 +19,28 @@ if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('a6f702271da49930a17e28b5928fe75a') + md5sums=('b7f908ea08218df08db06026215ec419') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('79b05cffa482234833ae1c4bb40664c3') + md5sums=('7e768412a16853078b04037a7cc9c8ac') fi build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" cd "${srcdir}" sh "${_pkg}.run" --extract-only cd "${_pkg}/kernel" - make SYSSRC=/lib/modules/"${_kernver}/build" module + make SYSSRC=/usr/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 -m755 "${pkgdir}/etc/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nvidia.conf" - echo "blacklist nvidiafb" >> "${pkgdir}/etc/modprobe.d/nvidia.conf" - sed -i -e "s/EXTRAMODULES='.*'/KERNEL_VERSION='${_kernver}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko" + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" } - -md5sums=('a6f702271da49930a17e28b5928fe75a') +md5sums=('7e768412a16853078b04037a7cc9c8ac') diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install index 8e01d0a..3fe1bd8 100644 --- a/abs/core/nvidia/nvidia.install +++ b/abs/core/nvidia/nvidia.install @@ -1,15 +1,15 @@ post_install() { - KERNEL_VERSION='2.6.39-LinHES' - depmod $KERNEL_VERSION + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - KERNEL_VERSION='2.6.39-LinHES' - depmod $KERNEL_VERSION + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - KERNEL_VERSION='2.6.39-LinHES' - depmod $KERNEL_VERSION + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |