Date: Thursday, March 3, 2016 @ 16:56:23 Author: tpowa Revision: 260665
db-move: moved nvidia-304xx from [testing] to [extra] (i686, x86_64) Added: nvidia-304xx/repos/extra-i686/PKGBUILD (from rev 260664, nvidia-304xx/repos/testing-i686/PKGBUILD) nvidia-304xx/repos/extra-i686/disable-mtrr.patch (from rev 260664, nvidia-304xx/repos/testing-i686/disable-mtrr.patch) nvidia-304xx/repos/extra-i686/nvidia-304xx-dkms.install (from rev 260664, nvidia-304xx/repos/testing-i686/nvidia-304xx-dkms.install) nvidia-304xx/repos/extra-i686/nvidia-304xx.install (from rev 260664, nvidia-304xx/repos/testing-i686/nvidia-304xx.install) nvidia-304xx/repos/extra-x86_64/PKGBUILD (from rev 260664, nvidia-304xx/repos/testing-x86_64/PKGBUILD) nvidia-304xx/repos/extra-x86_64/disable-mtrr.patch (from rev 260664, nvidia-304xx/repos/testing-x86_64/disable-mtrr.patch) nvidia-304xx/repos/extra-x86_64/nvidia-304xx-dkms.install (from rev 260664, nvidia-304xx/repos/testing-x86_64/nvidia-304xx-dkms.install) nvidia-304xx/repos/extra-x86_64/nvidia-304xx.install (from rev 260664, nvidia-304xx/repos/testing-x86_64/nvidia-304xx.install) Deleted: nvidia-304xx/repos/extra-i686/PKGBUILD nvidia-304xx/repos/extra-i686/disable-mtrr.patch nvidia-304xx/repos/extra-i686/nvidia-304xx-dkms.install nvidia-304xx/repos/extra-i686/nvidia-304xx.install nvidia-304xx/repos/extra-x86_64/PKGBUILD nvidia-304xx/repos/extra-x86_64/disable-mtrr.patch nvidia-304xx/repos/extra-x86_64/nvidia-304xx-dkms.install nvidia-304xx/repos/extra-x86_64/nvidia-304xx.install nvidia-304xx/repos/testing-i686/ nvidia-304xx/repos/testing-x86_64/ ----------------------------------------+ /PKGBUILD | 142 +++++++++++++++++++++++++++++++ /disable-mtrr.patch | 48 ++++++++++ /nvidia-304xx-dkms.install | 60 +++++++++++++ /nvidia-304xx.install | 26 +++++ extra-i686/PKGBUILD | 71 --------------- extra-i686/disable-mtrr.patch | 24 ----- extra-i686/nvidia-304xx-dkms.install | 30 ------ extra-i686/nvidia-304xx.install | 13 -- extra-x86_64/PKGBUILD | 71 --------------- extra-x86_64/disable-mtrr.patch | 24 ----- extra-x86_64/nvidia-304xx-dkms.install | 30 ------ extra-x86_64/nvidia-304xx.install | 13 -- 12 files changed, 276 insertions(+), 276 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-i686/PKGBUILD 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgbase=nvidia-304xx -pkgname=(nvidia-304xx nvidia-304xx-dkms) -pkgver=304.131 -_extramodules=extramodules-4.4-ARCH -pkgrel=6 -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5') -conflicts=('nvidia') -license=('custom') -options=('!strip') -source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - disable-mtrr.patch) -sha512sums=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e' - '07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93' - '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774') - -[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" - -prepare() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - # patches here - - # FS#47092 - (cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch) -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}/kernel" - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package_nvidia-304xx() { - pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" - depends=('linux>=4.4' 'linux<4.5' 'libgl' "nvidia-304xx-utils=${pkgver}") - conflicts+=('nvidia-304xx-dkms') - install=nvidia-304xx.install - - 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.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - - # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. -} - -package_nvidia-304xx-dkms() { - pkgdesc="NVIDIA driver sources for linux, 304xx legacy branch" - depends=('dkms' "nvidia-304xx-utils=$pkgver") - optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') - conflicts+=('nvidia-304xx') - install=nvidia-304xx-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 -} Copied: nvidia-304xx/repos/extra-i686/PKGBUILD (from rev 260664, nvidia-304xx/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-03-03 15:56:23 UTC (rev 260665) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia-304xx +pkgname=(nvidia-304xx nvidia-304xx-dkms) +pkgver=304.131 +_extramodules=extramodules-4.4-ARCH +pkgrel=7 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5') +conflicts=('nvidia') +license=('custom') +options=('!strip') +source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + disable-mtrr.patch) +sha512sums=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e' + '07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93' + '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + + # FS#47092 + (cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch) +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia-304xx() { + pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" + depends=('linux>=4.4' 'linux<4.5' 'libgl' "nvidia-304xx-utils=${pkgver}") + conflicts+=('nvidia-304xx-dkms') + install=nvidia-304xx.install + + 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.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. +} + +package_nvidia-304xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 304xx legacy branch" + depends=('dkms' "nvidia-304xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia-304xx') + install=nvidia-304xx-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 +} Deleted: extra-i686/disable-mtrr.patch =================================================================== --- extra-i686/disable-mtrr.patch 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-i686/disable-mtrr.patch 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,24 +0,0 @@ -Author: Luca Boccassi <luca.bocca...@gmail.com> -Description: Disable MTRR on kernel >= 4.3 - From kernel 4.3 and newer (commit 2baa891e42d84) mtrr_add and mtrr_del are no - longer exported. The Nvidia kernel shim still uses it as of 304.131, causing - the module to error out when loading. Disable MTRR if running on 4.3 or greater - until upstream fixes it. ---- a/nv-linux.h -+++ b/nv-linux.h -@@ -256,6 +256,15 @@ - #include <linux/seq_file.h> - #endif - -+/* -+ * As of version 304.131, os-agp.c and os-mtrr.c still use deprecated -+ * kernel APIs for mtrr which are no longer exported since 4.3, causing -+ * the module to error out when loaded. -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+#undef CONFIG_MTRR -+#endif -+ - #if !defined(NV_VMWARE) && defined(CONFIG_MTRR) - #include <asm/mtrr.h> - #endif Copied: nvidia-304xx/repos/extra-i686/disable-mtrr.patch (from rev 260664, nvidia-304xx/repos/testing-i686/disable-mtrr.patch) =================================================================== --- extra-i686/disable-mtrr.patch (rev 0) +++ extra-i686/disable-mtrr.patch 2016-03-03 15:56:23 UTC (rev 260665) @@ -0,0 +1,24 @@ +Author: Luca Boccassi <luca.bocca...@gmail.com> +Description: Disable MTRR on kernel >= 4.3 + From kernel 4.3 and newer (commit 2baa891e42d84) mtrr_add and mtrr_del are no + longer exported. The Nvidia kernel shim still uses it as of 304.131, causing + the module to error out when loading. Disable MTRR if running on 4.3 or greater + until upstream fixes it. +--- a/nv-linux.h ++++ b/nv-linux.h +@@ -256,6 +256,15 @@ + #include <linux/seq_file.h> + #endif + ++/* ++ * As of version 304.131, os-agp.c and os-mtrr.c still use deprecated ++ * kernel APIs for mtrr which are no longer exported since 4.3, causing ++ * the module to error out when loaded. ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) ++#undef CONFIG_MTRR ++#endif ++ + #if !defined(NV_VMWARE) && defined(CONFIG_MTRR) + #include <asm/mtrr.h> + #endif Deleted: extra-i686/nvidia-304xx-dkms.install =================================================================== --- extra-i686/nvidia-304xx-dkms.install 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-i686/nvidia-304xx-dkms.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,30 +0,0 @@ -#/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-304xx/repos/extra-i686/nvidia-304xx-dkms.install (from rev 260664, nvidia-304xx/repos/testing-i686/nvidia-304xx-dkms.install) =================================================================== --- extra-i686/nvidia-304xx-dkms.install (rev 0) +++ extra-i686/nvidia-304xx-dkms.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -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: Deleted: extra-i686/nvidia-304xx.install =================================================================== --- extra-i686/nvidia-304xx.install 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-i686/nvidia-304xx.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.4-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-304xx/repos/extra-i686/nvidia-304xx.install (from rev 260664, nvidia-304xx/repos/testing-i686/nvidia-304xx.install) =================================================================== --- extra-i686/nvidia-304xx.install (rev 0) +++ extra-i686/nvidia-304xx.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.4-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 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-x86_64/PKGBUILD 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgbase=nvidia-304xx -pkgname=(nvidia-304xx nvidia-304xx-dkms) -pkgver=304.131 -_extramodules=extramodules-4.4-ARCH -pkgrel=6 -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5') -conflicts=('nvidia') -license=('custom') -options=('!strip') -source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - disable-mtrr.patch) -sha512sums=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e' - '07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93' - '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774') - -[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" - -prepare() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - # patches here - - # FS#47092 - (cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch) -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}/kernel" - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package_nvidia-304xx() { - pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" - depends=('linux>=4.4' 'linux<4.5' 'libgl' "nvidia-304xx-utils=${pkgver}") - conflicts+=('nvidia-304xx-dkms') - install=nvidia-304xx.install - - 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.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - - # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. -} - -package_nvidia-304xx-dkms() { - pkgdesc="NVIDIA driver sources for linux, 304xx legacy branch" - depends=('dkms' "nvidia-304xx-utils=$pkgver") - optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') - conflicts+=('nvidia-304xx') - install=nvidia-304xx-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 -} Copied: nvidia-304xx/repos/extra-x86_64/PKGBUILD (from rev 260664, nvidia-304xx/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-03-03 15:56:23 UTC (rev 260665) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia-304xx +pkgname=(nvidia-304xx nvidia-304xx-dkms) +pkgver=304.131 +_extramodules=extramodules-4.4-ARCH +pkgrel=7 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5') +conflicts=('nvidia') +license=('custom') +options=('!strip') +source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + disable-mtrr.patch) +sha512sums=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e' + '07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93' + '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + + # FS#47092 + (cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch) +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia-304xx() { + pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" + depends=('linux>=4.4' 'linux<4.5' 'libgl' "nvidia-304xx-utils=${pkgver}") + conflicts+=('nvidia-304xx-dkms') + install=nvidia-304xx.install + + 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.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. +} + +package_nvidia-304xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 304xx legacy branch" + depends=('dkms' "nvidia-304xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia-304xx') + install=nvidia-304xx-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 +} Deleted: extra-x86_64/disable-mtrr.patch =================================================================== --- extra-x86_64/disable-mtrr.patch 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-x86_64/disable-mtrr.patch 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,24 +0,0 @@ -Author: Luca Boccassi <luca.bocca...@gmail.com> -Description: Disable MTRR on kernel >= 4.3 - From kernel 4.3 and newer (commit 2baa891e42d84) mtrr_add and mtrr_del are no - longer exported. The Nvidia kernel shim still uses it as of 304.131, causing - the module to error out when loading. Disable MTRR if running on 4.3 or greater - until upstream fixes it. ---- a/nv-linux.h -+++ b/nv-linux.h -@@ -256,6 +256,15 @@ - #include <linux/seq_file.h> - #endif - -+/* -+ * As of version 304.131, os-agp.c and os-mtrr.c still use deprecated -+ * kernel APIs for mtrr which are no longer exported since 4.3, causing -+ * the module to error out when loaded. -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+#undef CONFIG_MTRR -+#endif -+ - #if !defined(NV_VMWARE) && defined(CONFIG_MTRR) - #include <asm/mtrr.h> - #endif Copied: nvidia-304xx/repos/extra-x86_64/disable-mtrr.patch (from rev 260664, nvidia-304xx/repos/testing-x86_64/disable-mtrr.patch) =================================================================== --- extra-x86_64/disable-mtrr.patch (rev 0) +++ extra-x86_64/disable-mtrr.patch 2016-03-03 15:56:23 UTC (rev 260665) @@ -0,0 +1,24 @@ +Author: Luca Boccassi <luca.bocca...@gmail.com> +Description: Disable MTRR on kernel >= 4.3 + From kernel 4.3 and newer (commit 2baa891e42d84) mtrr_add and mtrr_del are no + longer exported. The Nvidia kernel shim still uses it as of 304.131, causing + the module to error out when loading. Disable MTRR if running on 4.3 or greater + until upstream fixes it. +--- a/nv-linux.h ++++ b/nv-linux.h +@@ -256,6 +256,15 @@ + #include <linux/seq_file.h> + #endif + ++/* ++ * As of version 304.131, os-agp.c and os-mtrr.c still use deprecated ++ * kernel APIs for mtrr which are no longer exported since 4.3, causing ++ * the module to error out when loaded. ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) ++#undef CONFIG_MTRR ++#endif ++ + #if !defined(NV_VMWARE) && defined(CONFIG_MTRR) + #include <asm/mtrr.h> + #endif Deleted: extra-x86_64/nvidia-304xx-dkms.install =================================================================== --- extra-x86_64/nvidia-304xx-dkms.install 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-x86_64/nvidia-304xx-dkms.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,30 +0,0 @@ -#/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-304xx/repos/extra-x86_64/nvidia-304xx-dkms.install (from rev 260664, nvidia-304xx/repos/testing-x86_64/nvidia-304xx-dkms.install) =================================================================== --- extra-x86_64/nvidia-304xx-dkms.install (rev 0) +++ extra-x86_64/nvidia-304xx-dkms.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -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: Deleted: extra-x86_64/nvidia-304xx.install =================================================================== --- extra-x86_64/nvidia-304xx.install 2016-03-03 15:54:53 UTC (rev 260664) +++ extra-x86_64/nvidia-304xx.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.4-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-304xx/repos/extra-x86_64/nvidia-304xx.install (from rev 260664, nvidia-304xx/repos/testing-x86_64/nvidia-304xx.install) =================================================================== --- extra-x86_64/nvidia-304xx.install (rev 0) +++ extra-x86_64/nvidia-304xx.install 2016-03-03 15:56:23 UTC (rev 260665) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.4-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 +}