From ee524a45318deefff04ced9fd94d98e80dfde93f Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 9 Dec 2013 09:34:39 +0100 Subject: Rename nvidia-custom -> nvidia-drd --- nvidia-custom/.gitignore | 1 - nvidia-custom/PKGBUILD | 51 -------------------------------------------- nvidia-custom/nvidia.install | 18 ---------------- nvidia-drd/.gitignore | 1 + nvidia-drd/PKGBUILD | 51 ++++++++++++++++++++++++++++++++++++++++++++ nvidia-drd/nvidia.install | 18 ++++++++++++++++ 6 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 nvidia-custom/.gitignore delete mode 100644 nvidia-custom/PKGBUILD delete mode 100644 nvidia-custom/nvidia.install create mode 100644 nvidia-drd/.gitignore create mode 100644 nvidia-drd/PKGBUILD create mode 100644 nvidia-drd/nvidia.install diff --git a/nvidia-custom/.gitignore b/nvidia-custom/.gitignore deleted file mode 100644 index 9857323..0000000 --- a/nvidia-custom/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.run diff --git a/nvidia-custom/PKGBUILD b/nvidia-custom/PKGBUILD deleted file mode 100644 index 41d5b1d..0000000 --- a/nvidia-custom/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 199771 2013-11-15 21:40:40Z svenstaro $ -# Maintainer : Thomas Baechler - -pkgname=nvidia-drd -pkgver=331.20 -_extramodules=extramodules-3.12-drd -pkgrel=2 -pkgdesc="NVIDIA drivers for linux" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux-drd>=3.12' 'linux-drd<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}") -makedepends=('linux-drd-headers>=3.12' 'linux-drd-headers<3.13') -conflicts=('nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) -#source=('nvidia-linux-3.12.patch') -#md5sums=('d267069bc456de269424b4e1b46a3745') - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums+=('801aa04a087891690f1cac09575b2ba9') -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+=('28295eed56c2ca996401c0093279620f') -fi - -prepare() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}" -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${srcdir}"/"${_pkg}"/kernel - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/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-drd.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" -} diff --git a/nvidia-custom/nvidia.install b/nvidia-custom/nvidia.install deleted file mode 100644 index fc4e891..0000000 --- a/nvidia-custom/nvidia.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.12-drd' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.12-drd' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then - echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' - fi -} - -post_remove() { - EXTRAMODULES='extramodules-3.12-drd' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/nvidia-drd/.gitignore b/nvidia-drd/.gitignore new file mode 100644 index 0000000..9857323 --- /dev/null +++ b/nvidia-drd/.gitignore @@ -0,0 +1 @@ +*.run diff --git a/nvidia-drd/PKGBUILD b/nvidia-drd/PKGBUILD new file mode 100644 index 0000000..41d5b1d --- /dev/null +++ b/nvidia-drd/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 199771 2013-11-15 21:40:40Z svenstaro $ +# Maintainer : Thomas Baechler + +pkgname=nvidia-drd +pkgver=331.20 +_extramodules=extramodules-3.12-drd +pkgrel=2 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux-drd>=3.12' 'linux-drd<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}") +makedepends=('linux-drd-headers>=3.12' 'linux-drd-headers<3.13') +conflicts=('nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) +#source=('nvidia-linux-3.12.patch') +#md5sums=('d267069bc456de269424b4e1b46a3745') + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums+=('801aa04a087891690f1cac09575b2ba9') +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+=('28295eed56c2ca996401c0093279620f') +fi + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${srcdir}"/"${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/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-drd.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" +} diff --git a/nvidia-drd/nvidia.install b/nvidia-drd/nvidia.install new file mode 100644 index 0000000..fc4e891 --- /dev/null +++ b/nvidia-drd/nvidia.install @@ -0,0 +1,18 @@ +post_install() { + EXTRAMODULES='extramodules-3.12-drd' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.12-drd' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then + echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' + fi +} + +post_remove() { + EXTRAMODULES='extramodules-3.12-drd' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} -- cgit v1.2.3-70-g09d2