Date: Monday, September 28, 2015 @ 08:37:48 Author: tpowa Revision: 247557
db-move: moved nvidia from [testing] to [extra] (i686, x86_64) Added: nvidia/repos/extra-i686/PKGBUILD (from rev 247555, nvidia/repos/testing-i686/PKGBUILD) nvidia/repos/extra-i686/nvidia-dkms.install (from rev 247555, nvidia/repos/testing-i686/nvidia-dkms.install) nvidia/repos/extra-i686/nvidia.install (from rev 247555, nvidia/repos/testing-i686/nvidia.install) nvidia/repos/extra-x86_64/PKGBUILD (from rev 247555, nvidia/repos/testing-x86_64/PKGBUILD) nvidia/repos/extra-x86_64/nvidia-dkms.install (from rev 247555, nvidia/repos/testing-x86_64/nvidia-dkms.install) nvidia/repos/extra-x86_64/nvidia.install (from rev 247555, nvidia/repos/testing-x86_64/nvidia.install) Deleted: nvidia/repos/extra-i686/PKGBUILD nvidia/repos/extra-i686/nv-drm-343.36.patch nvidia/repos/extra-i686/nvidia.install nvidia/repos/extra-x86_64/PKGBUILD nvidia/repos/extra-x86_64/nv-drm-343.36.patch nvidia/repos/extra-x86_64/nvidia.install nvidia/repos/testing-i686/ nvidia/repos/testing-x86_64/ ----------------------------------+ /PKGBUILD | 156 +++++++++++++++++++++++++++++++++++++ /nvidia.install | 26 ++++++ extra-i686/PKGBUILD | 55 ------------- extra-i686/nv-drm-343.36.patch | 14 --- extra-i686/nvidia-dkms.install | 30 +++++++ extra-i686/nvidia.install | 13 --- extra-x86_64/PKGBUILD | 55 ------------- extra-x86_64/nv-drm-343.36.patch | 14 --- extra-x86_64/nvidia-dkms.install | 30 +++++++ extra-x86_64/nvidia.install | 13 --- 10 files changed, 242 insertions(+), 164 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-09-28 06:37:46 UTC (rev 247556) +++ extra-i686/PKGBUILD 2015-09-28 06:37:48 UTC (rev 247557) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Maintainer: Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia -pkgver=352.41 -_extramodules=extramodules-4.1-ARCH -pkgrel=1 -pkgdesc="NVIDIA drivers for linux" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=4.1' 'linux<4.2' "nvidia-utils=${pkgver}" 'libgl') -makedepends=('linux-headers>=4.1' 'linux-headers<4.2') -license=('custom') -install=nvidia.install -options=(!strip) -source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('3f9c9fed035fa845e3f6a1ea5f5732f7' - 'd41d1a358edbade36cfd97cdcc9a80b9') - -[[ "$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 - - if [[ "$CARCH" = "x86_64" ]]; then - cd uvm - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module - fi -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - - if [[ "$CARCH" = "x86_64" ]]; then - install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" - fi - - 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" -} Copied: nvidia/repos/extra-i686/PKGBUILD (from rev 247555, nvidia/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-09-28 06:37:48 UTC (rev 247557) @@ -0,0 +1,78 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=355.11 +_extramodules=extramodules-4.2-ARCH +pkgrel=2 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3') +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='16d143ccafe99328a2ca8e5a396fd4bc' +md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc' + +[[ "$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 + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[1]="nvidia-uvm"\ +DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia() { + pkgdesc="NVIDIA drivers for linux" + depends=('linux>=4.2' 'linux<4.3' "nvidia-utils=${pkgver}" 'libgl') + install=nvidia.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + if [[ "$CARCH" = "x86_64" ]]; then + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + fi + + 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-dkms() { + pkgdesc="NVIDIA driver sources for linux" + depends=('dkms' "nvidia-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflict+=('nvidia') + install=nvidia-dkms.install + + cd ${_pkg} + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Deleted: extra-i686/nv-drm-343.36.patch =================================================================== --- extra-i686/nv-drm-343.36.patch 2015-09-28 06:37:46 UTC (rev 247556) +++ extra-i686/nv-drm-343.36.patch 2015-09-28 06:37:48 UTC (rev 247557) @@ -1,14 +0,0 @@ -diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c -index c0b41a0..700c193 100644 ---- a/kernel/nv-drm.c -+++ b/kernel/nv-drm.c -@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = { - .gem_prime_vmap = nv_gem_prime_vmap, - .gem_prime_vunmap = nv_gem_prime_vunmap, - -+ .set_busid = drm_pci_set_busid, -+ - .name = "nvidia-drm", - .desc = "NVIDIA DRM driver", - .date = "20130102", - Copied: nvidia/repos/extra-i686/nvidia-dkms.install (from rev 247555, nvidia/repos/testing-i686/nvidia-dkms.install) =================================================================== --- extra-i686/nvidia-dkms.install (rev 0) +++ extra-i686/nvidia-dkms.install 2015-09-28 06:37:48 UTC (rev 247557) @@ -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: \ No newline at end of file Deleted: extra-i686/nvidia.install =================================================================== --- extra-i686/nvidia.install 2015-09-28 06:37:46 UTC (rev 247556) +++ extra-i686/nvidia.install 2015-09-28 06:37:48 UTC (rev 247557) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.1-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/repos/extra-i686/nvidia.install (from rev 247555, nvidia/repos/testing-i686/nvidia.install) =================================================================== --- extra-i686/nvidia.install (rev 0) +++ extra-i686/nvidia.install 2015-09-28 06:37:48 UTC (rev 247557) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.2-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 +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-09-28 06:37:46 UTC (rev 247556) +++ extra-x86_64/PKGBUILD 2015-09-28 06:37:48 UTC (rev 247557) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Maintainer: Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia -pkgver=352.41 -_extramodules=extramodules-4.1-ARCH -pkgrel=1 -pkgdesc="NVIDIA drivers for linux" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=4.1' 'linux<4.2' "nvidia-utils=${pkgver}" 'libgl') -makedepends=('linux-headers>=4.1' 'linux-headers<4.2') -license=('custom') -install=nvidia.install -options=(!strip) -source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('3f9c9fed035fa845e3f6a1ea5f5732f7' - 'd41d1a358edbade36cfd97cdcc9a80b9') - -[[ "$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 - - if [[ "$CARCH" = "x86_64" ]]; then - cd uvm - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module - fi -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - - if [[ "$CARCH" = "x86_64" ]]; then - install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" - fi - - 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" -} Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 247555, nvidia/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-09-28 06:37:48 UTC (rev 247557) @@ -0,0 +1,78 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=355.11 +_extramodules=extramodules-4.2-ARCH +pkgrel=2 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3') +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='16d143ccafe99328a2ca8e5a396fd4bc' +md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc' + +[[ "$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 + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[1]="nvidia-uvm"\ +DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia() { + pkgdesc="NVIDIA drivers for linux" + depends=('linux>=4.2' 'linux<4.3' "nvidia-utils=${pkgver}" 'libgl') + install=nvidia.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + if [[ "$CARCH" = "x86_64" ]]; then + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + fi + + 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-dkms() { + pkgdesc="NVIDIA driver sources for linux" + depends=('dkms' "nvidia-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflict+=('nvidia') + install=nvidia-dkms.install + + cd ${_pkg} + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Deleted: extra-x86_64/nv-drm-343.36.patch =================================================================== --- extra-x86_64/nv-drm-343.36.patch 2015-09-28 06:37:46 UTC (rev 247556) +++ extra-x86_64/nv-drm-343.36.patch 2015-09-28 06:37:48 UTC (rev 247557) @@ -1,14 +0,0 @@ -diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c -index c0b41a0..700c193 100644 ---- a/kernel/nv-drm.c -+++ b/kernel/nv-drm.c -@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = { - .gem_prime_vmap = nv_gem_prime_vmap, - .gem_prime_vunmap = nv_gem_prime_vunmap, - -+ .set_busid = drm_pci_set_busid, -+ - .name = "nvidia-drm", - .desc = "NVIDIA DRM driver", - .date = "20130102", - Copied: nvidia/repos/extra-x86_64/nvidia-dkms.install (from rev 247555, nvidia/repos/testing-x86_64/nvidia-dkms.install) =================================================================== --- extra-x86_64/nvidia-dkms.install (rev 0) +++ extra-x86_64/nvidia-dkms.install 2015-09-28 06:37:48 UTC (rev 247557) @@ -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: \ No newline at end of file Deleted: extra-x86_64/nvidia.install =================================================================== --- extra-x86_64/nvidia.install 2015-09-28 06:37:46 UTC (rev 247556) +++ extra-x86_64/nvidia.install 2015-09-28 06:37:48 UTC (rev 247557) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.1-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/repos/extra-x86_64/nvidia.install (from rev 247555, nvidia/repos/testing-x86_64/nvidia.install) =================================================================== --- extra-x86_64/nvidia.install (rev 0) +++ extra-x86_64/nvidia.install 2015-09-28 06:37:48 UTC (rev 247557) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.2-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 +}