Date: Thursday, January 26, 2017 @ 16:32:54
Author: tpowa
Revision: 287518
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia-304xx/repos/testing-i686/PKGBUILD
(from rev 287517, nvidia-304xx/trunk/PKGBUILD)
nvidia-304xx/repos/testing-i686/disable-mtrr.patch
(from rev 287517, nvidia-304xx/trunk/disable-mtrr.patch)
nvidia-304xx/repos/testing-i686/nvidia-304xx.install
(from rev 287517, nvidia-304xx/trunk/nvidia-304xx.install)
nvidia-304xx/repos/testing-x86_64/PKGBUILD
(from rev 287517, nvidia-304xx/trunk/PKGBUILD)
nvidia-304xx/repos/testing-x86_64/disable-mtrr.patch
(from rev 287517, nvidia-304xx/trunk/disable-mtrr.patch)
nvidia-304xx/repos/testing-x86_64/nvidia-304xx.install
(from rev 287517, nvidia-304xx/trunk/nvidia-304xx.install)
Deleted:
nvidia-304xx/repos/testing-i686/PKGBUILD
nvidia-304xx/repos/testing-i686/disable-mtrr.patch
nvidia-304xx/repos/testing-i686/nvidia-304xx.install
nvidia-304xx/repos/testing-x86_64/PKGBUILD
nvidia-304xx/repos/testing-x86_64/disable-mtrr.patch
nvidia-304xx/repos/testing-x86_64/nvidia-304xx.install
-------------------------------------+
/PKGBUILD | 144 ++++++++++++++++++++++++++++++++++
/disable-mtrr.patch | 48 +++++++++++
/nvidia-304xx.install | 26 ++++++
testing-i686/PKGBUILD | 72 -----------------
testing-i686/disable-mtrr.patch | 24 -----
testing-i686/nvidia-304xx.install | 13 ---
testing-x86_64/PKGBUILD | 72 -----------------
testing-x86_64/disable-mtrr.patch | 24 -----
testing-x86_64/nvidia-304xx.install | 13 ---
9 files changed, 218 insertions(+), 218 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-01-26 16:32:38 UTC (rev 287517)
+++ testing-i686/PKGBUILD 2017-01-26 16:32:54 UTC (rev 287518)
@@ -1,72 +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.134
-_extramodules=extramodules-4.9-ARCH
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux'
'linux-headers>=4.9' 'linux-headers<4.10')
-conflicts=('nvidia')
-license=('custom')
-options=('!strip')
-source=('disable-mtrr.patch')
-source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
-sha512sums_i686=('e047c62b33b092225ead42134acd596e3ae43d9bb8324188308dd7d497f33e790e7366d7a1c5ef5de66f484219d99de4c6e6206d390122d3fab4d30397ab463c')
-sha512sums_x86_64=('339efb8b47faaa16b984d84e43ef18d849a563c95298972c36616a22712740e3233c2cd7b0837d393a8f24a6ec5b501295cdc77adae12deccc993dfca48022fc')
-
-[[ "$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)
-
- cp -a kernel kernel-dkms
-}
-
-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.9' 'linux<4.10' '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')
-
- cd ${_pkg}
- make -C kernel clean
- 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
-}
Copied: nvidia-304xx/repos/testing-i686/PKGBUILD (from rev 287517,
nvidia-304xx/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-01-26 16:32:54 UTC (rev 287518)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Thomas Baechler <tho...@archlinux.org>
+
+pkgbase=nvidia-304xx
+pkgname=(nvidia-304xx nvidia-304xx-dkms)
+pkgver=304.134
+_extramodules=extramodules-4.9-ARCH
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux'
'linux-headers>=4.9' 'linux-headers<4.10')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=('disable-mtrr.patch')
+source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
+source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
+sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+sha512sums_i686=('e047c62b33b092225ead42134acd596e3ae43d9bb8324188308dd7d497f33e790e7366d7a1c5ef5de66f484219d99de4c6e6206d390122d3fab4d30397ab463c')
+sha512sums_x86_64=('339efb8b47faaa16b984d84e43ef18d849a563c95298972c36616a22712740e3233c2cd7b0837d393a8f24a6ec5b501295cdc77adae12deccc993dfca48022fc')
+
+[[ "$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)
+
+ cp -a kernel kernel-dkms
+}
+
+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.9' 'linux<4.10' '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')
+
+ cd ${_pkg}
+ make -C kernel clean
+ 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: testing-i686/disable-mtrr.patch
===================================================================
--- testing-i686/disable-mtrr.patch 2017-01-26 16:32:38 UTC (rev 287517)
+++ testing-i686/disable-mtrr.patch 2017-01-26 16:32:54 UTC (rev 287518)
@@ -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/testing-i686/disable-mtrr.patch (from rev 287517,
nvidia-304xx/trunk/disable-mtrr.patch)
===================================================================
--- testing-i686/disable-mtrr.patch (rev 0)
+++ testing-i686/disable-mtrr.patch 2017-01-26 16:32:54 UTC (rev 287518)
@@ -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: testing-i686/nvidia-304xx.install
===================================================================
--- testing-i686/nvidia-304xx.install 2017-01-26 16:32:38 UTC (rev 287517)
+++ testing-i686/nvidia-304xx.install 2017-01-26 16:32:54 UTC (rev 287518)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.9-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/testing-i686/nvidia-304xx.install (from rev 287517,
nvidia-304xx/trunk/nvidia-304xx.install)
===================================================================
--- testing-i686/nvidia-304xx.install (rev 0)
+++ testing-i686/nvidia-304xx.install 2017-01-26 16:32:54 UTC (rev 287518)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.9-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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-01-26 16:32:38 UTC (rev 287517)
+++ testing-x86_64/PKGBUILD 2017-01-26 16:32:54 UTC (rev 287518)
@@ -1,72 +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.134
-_extramodules=extramodules-4.9-ARCH
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux'
'linux-headers>=4.9' 'linux-headers<4.10')
-conflicts=('nvidia')
-license=('custom')
-options=('!strip')
-source=('disable-mtrr.patch')
-source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
-sha512sums_i686=('e047c62b33b092225ead42134acd596e3ae43d9bb8324188308dd7d497f33e790e7366d7a1c5ef5de66f484219d99de4c6e6206d390122d3fab4d30397ab463c')
-sha512sums_x86_64=('339efb8b47faaa16b984d84e43ef18d849a563c95298972c36616a22712740e3233c2cd7b0837d393a8f24a6ec5b501295cdc77adae12deccc993dfca48022fc')
-
-[[ "$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)
-
- cp -a kernel kernel-dkms
-}
-
-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.9' 'linux<4.10' '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')
-
- cd ${_pkg}
- make -C kernel clean
- 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
-}
Copied: nvidia-304xx/repos/testing-x86_64/PKGBUILD (from rev 287517,
nvidia-304xx/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-01-26 16:32:54 UTC (rev 287518)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Thomas Baechler <tho...@archlinux.org>
+
+pkgbase=nvidia-304xx
+pkgname=(nvidia-304xx nvidia-304xx-dkms)
+pkgver=304.134
+_extramodules=extramodules-4.9-ARCH
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux'
'linux-headers>=4.9' 'linux-headers<4.10')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=('disable-mtrr.patch')
+source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
+source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
+sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+sha512sums_i686=('e047c62b33b092225ead42134acd596e3ae43d9bb8324188308dd7d497f33e790e7366d7a1c5ef5de66f484219d99de4c6e6206d390122d3fab4d30397ab463c')
+sha512sums_x86_64=('339efb8b47faaa16b984d84e43ef18d849a563c95298972c36616a22712740e3233c2cd7b0837d393a8f24a6ec5b501295cdc77adae12deccc993dfca48022fc')
+
+[[ "$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)
+
+ cp -a kernel kernel-dkms
+}
+
+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.9' 'linux<4.10' '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')
+
+ cd ${_pkg}
+ make -C kernel clean
+ 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: testing-x86_64/disable-mtrr.patch
===================================================================
--- testing-x86_64/disable-mtrr.patch 2017-01-26 16:32:38 UTC (rev 287517)
+++ testing-x86_64/disable-mtrr.patch 2017-01-26 16:32:54 UTC (rev 287518)
@@ -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/testing-x86_64/disable-mtrr.patch (from rev 287517,
nvidia-304xx/trunk/disable-mtrr.patch)
===================================================================
--- testing-x86_64/disable-mtrr.patch (rev 0)
+++ testing-x86_64/disable-mtrr.patch 2017-01-26 16:32:54 UTC (rev 287518)
@@ -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: testing-x86_64/nvidia-304xx.install
===================================================================
--- testing-x86_64/nvidia-304xx.install 2017-01-26 16:32:38 UTC (rev 287517)
+++ testing-x86_64/nvidia-304xx.install 2017-01-26 16:32:54 UTC (rev 287518)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.9-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/testing-x86_64/nvidia-304xx.install (from rev
287517, nvidia-304xx/trunk/nvidia-304xx.install)
===================================================================
--- testing-x86_64/nvidia-304xx.install (rev 0)
+++ testing-x86_64/nvidia-304xx.install 2017-01-26 16:32:54 UTC (rev 287518)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.9-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
+}
