Date: Wednesday, February 8, 2012 @ 04:34:11 Author: ibiru Revision: 149468
archrelease: copy trunk to extra-i686, extra-x86_64 Added: nvidia/repos/extra-i686/PKGBUILD (from rev 149467, nvidia/trunk/PKGBUILD) nvidia/repos/extra-i686/nvidia.install (from rev 149467, nvidia/trunk/nvidia.install) nvidia/repos/extra-x86_64/PKGBUILD (from rev 149467, nvidia/trunk/PKGBUILD) nvidia/repos/extra-x86_64/nvidia.install (from rev 149467, nvidia/trunk/nvidia.install) Deleted: nvidia/repos/extra-i686/PKGBUILD nvidia/repos/extra-i686/nvidia.install nvidia/repos/extra-x86_64/PKGBUILD nvidia/repos/extra-x86_64/nvidia.install -----------------------------+ extra-i686/PKGBUILD | 91 +++++++++++++++++++++--------------------- extra-i686/nvidia.install | 30 ++++++------- extra-x86_64/PKGBUILD | 91 +++++++++++++++++++++--------------------- extra-x86_64/nvidia.install | 30 ++++++------- 4 files changed, 122 insertions(+), 120 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-02-08 09:32:45 UTC (rev 149467) +++ extra-i686/PKGBUILD 2012-02-08 09:34:11 UTC (rev 149468) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia -pkgver=290.10 -_extramodules=extramodules-3.2-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=2 -pkgdesc="NVIDIA drivers for linux." -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=3.2' 'linux<3.3' "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.2' 'linux-headers<3.3') -conflicts=('nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('50319a4b3818c12c9c7243525e0e6316') -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=('cebfba9a7e91716a06c66bb5b38d9661') -fi - -build() { - 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/${_extramodules}/nvidia.ko" - install -d -m755 "${pkgdir}/etc/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko" -} Copied: nvidia/repos/extra-i686/PKGBUILD (from rev 149467, nvidia/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-02-08 09:34:11 UTC (rev 149468) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia +pkgver=290.10 +_extramodules=extramodules-3.2-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" +pkgrel=3 +pkgdesc="NVIDIA drivers for linux." +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.2' 'linux<3.3' "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.2' 'linux-headers<3.3') +conflicts=('nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('50319a4b3818c12c9c7243525e0e6316') +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=('cebfba9a7e91716a06c66bb5b38d9661') +fi + +build() { + 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/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/lib/modprobe.d/nvidia.conf" + echo "blacklist nvidiafb" >> "${pkgdir}/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko" +} Deleted: extra-i686/nvidia.install =================================================================== --- extra-i686/nvidia.install 2012-02-08 09:32:45 UTC (rev 149467) +++ extra-i686/nvidia.install 2012-02-08 09:34:11 UTC (rev 149468) @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} Copied: nvidia/repos/extra-i686/nvidia.install (from rev 149467, nvidia/trunk/nvidia.install) =================================================================== --- extra-i686/nvidia.install (rev 0) +++ extra-i686/nvidia.install 2012-02-08 09:34:11 UTC (rev 149468) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.2-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.2-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.2-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-02-08 09:32:45 UTC (rev 149467) +++ extra-x86_64/PKGBUILD 2012-02-08 09:34:11 UTC (rev 149468) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia -pkgver=290.10 -_extramodules=extramodules-3.2-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=2 -pkgdesc="NVIDIA drivers for linux." -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=3.2' 'linux<3.3' "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.2' 'linux-headers<3.3') -conflicts=('nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('50319a4b3818c12c9c7243525e0e6316') -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=('cebfba9a7e91716a06c66bb5b38d9661') -fi - -build() { - 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/${_extramodules}/nvidia.ko" - install -d -m755 "${pkgdir}/etc/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko" -} Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 149467, nvidia/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-02-08 09:34:11 UTC (rev 149468) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia +pkgver=290.10 +_extramodules=extramodules-3.2-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" +pkgrel=3 +pkgdesc="NVIDIA drivers for linux." +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.2' 'linux<3.3' "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.2' 'linux-headers<3.3') +conflicts=('nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('50319a4b3818c12c9c7243525e0e6316') +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=('cebfba9a7e91716a06c66bb5b38d9661') +fi + +build() { + 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/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/lib/modprobe.d/nvidia.conf" + echo "blacklist nvidiafb" >> "${pkgdir}/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko" +} Deleted: extra-x86_64/nvidia.install =================================================================== --- extra-x86_64/nvidia.install 2012-02-08 09:32:45 UTC (rev 149467) +++ extra-x86_64/nvidia.install 2012-02-08 09:34:11 UTC (rev 149468) @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} Copied: nvidia/repos/extra-x86_64/nvidia.install (from rev 149467, nvidia/trunk/nvidia.install) =================================================================== --- extra-x86_64/nvidia.install (rev 0) +++ extra-x86_64/nvidia.install 2012-02-08 09:34:11 UTC (rev 149468) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.2-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.2-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.2-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +}