Date: Sunday, November 22, 2015 @ 08:38:23 Author: lcarlier Revision: 251861
archrelease: copy trunk to testing-i686, testing-x86_64 Added: nvidia-340xx/repos/testing-i686/ nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 251860, nvidia-340xx/trunk/PKGBUILD) nvidia-340xx/repos/testing-i686/nvidia-340xx-dkms.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx-dkms.install) nvidia-340xx/repos/testing-i686/nvidia-340xx.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx.install) nvidia-340xx/repos/testing-x86_64/ nvidia-340xx/repos/testing-x86_64/PKGBUILD (from rev 251860, nvidia-340xx/trunk/PKGBUILD) nvidia-340xx/repos/testing-x86_64/nvidia-340xx-dkms.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx-dkms.install) nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx.install) ------------------------------------------+ testing-i686/PKGBUILD | 68 +++++++++++++++++++++++++++++ testing-i686/nvidia-340xx-dkms.install | 30 ++++++++++++ testing-i686/nvidia-340xx.install | 13 +++++ testing-x86_64/PKGBUILD | 68 +++++++++++++++++++++++++++++ testing-x86_64/nvidia-340xx-dkms.install | 30 ++++++++++++ testing-x86_64/nvidia-340xx.install | 13 +++++ 6 files changed, 222 insertions(+) Copied: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 251860, nvidia-340xx/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-11-22 07:38:23 UTC (rev 251861) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia-340xx +pkgname=(nvidia-340xx nvidia-340xx-dkms) +pkgver=340.96 +_extramodules=extramodules-4.3-ARCH +pkgrel=3 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4') +conflicts=('nvidia') +license=('custom') +options=(!strip) +source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90') +md5sums_x86_64=('7bdbcee13bade63227933d9217571882') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + + cd uvm + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia-340xx() { + pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" + depends=('linux>=4.3' 'linux<4.4' 'libgl' "nvidia-340xx-utils=${pkgver}") + conflict+=('nvidia-340xx-dkms') + install=nvidia-340xx.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} + +package_nvidia-340xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch" + depends=('dkms' "nvidia-340xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia-340xx') + install=nvidia-340xx-dkms.install + + cd ${_pkg} + make -C kernel clean + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver} + echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf + cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf +} Copied: nvidia-340xx/repos/testing-i686/nvidia-340xx-dkms.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx-dkms.install) =================================================================== --- testing-i686/nvidia-340xx-dkms.install (rev 0) +++ testing-i686/nvidia-340xx-dkms.install 2015-11-22 07:38:23 UTC (rev 251861) @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: Copied: nvidia-340xx/repos/testing-i686/nvidia-340xx.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx.install) =================================================================== --- testing-i686/nvidia-340xx.install (rev 0) +++ testing-i686/nvidia-340xx.install 2015-11-22 07:38:23 UTC (rev 251861) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.3-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: nvidia-340xx/repos/testing-x86_64/PKGBUILD (from rev 251860, nvidia-340xx/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-11-22 07:38:23 UTC (rev 251861) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia-340xx +pkgname=(nvidia-340xx nvidia-340xx-dkms) +pkgver=340.96 +_extramodules=extramodules-4.3-ARCH +pkgrel=3 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4') +conflicts=('nvidia') +license=('custom') +options=(!strip) +source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90') +md5sums_x86_64=('7bdbcee13bade63227933d9217571882') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + + cd uvm + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia-340xx() { + pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" + depends=('linux>=4.3' 'linux<4.4' 'libgl' "nvidia-340xx-utils=${pkgver}") + conflict+=('nvidia-340xx-dkms') + install=nvidia-340xx.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} + +package_nvidia-340xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch" + depends=('dkms' "nvidia-340xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia-340xx') + install=nvidia-340xx-dkms.install + + cd ${_pkg} + make -C kernel clean + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver} + echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf + cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf +} Copied: nvidia-340xx/repos/testing-x86_64/nvidia-340xx-dkms.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx-dkms.install) =================================================================== --- testing-x86_64/nvidia-340xx-dkms.install (rev 0) +++ testing-x86_64/nvidia-340xx-dkms.install 2015-11-22 07:38:23 UTC (rev 251861) @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: Copied: nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install (from rev 251860, nvidia-340xx/trunk/nvidia-340xx.install) =================================================================== --- testing-x86_64/nvidia-340xx.install (rev 0) +++ testing-x86_64/nvidia-340xx.install 2015-11-22 07:38:23 UTC (rev 251861) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.3-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}