[arch-commits] Commit in nvidia-304xx-lts/repos (12 files)

Felix Yan felixonmars at archlinux.org
Fri Oct 21 07:41:23 UTC 2016 

    Date: Friday, October 21, 2016 @ 07:41:23
  Author: felixonmars
Revision: 279083

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nvidia-304xx-lts/repos/extra-i686/PKGBUILD
    (from rev 279082, nvidia-304xx-lts/trunk/PKGBUILD)
  nvidia-304xx-lts/repos/extra-i686/disable-mtrr.patch
    (from rev 279082, nvidia-304xx-lts/trunk/disable-mtrr.patch)
  nvidia-304xx-lts/repos/extra-i686/nvidia-304xx-lts.install
    (from rev 279082, nvidia-304xx-lts/trunk/nvidia-304xx-lts.install)
  nvidia-304xx-lts/repos/extra-x86_64/PKGBUILD
    (from rev 279082, nvidia-304xx-lts/trunk/PKGBUILD)
  nvidia-304xx-lts/repos/extra-x86_64/disable-mtrr.patch
    (from rev 279082, nvidia-304xx-lts/trunk/disable-mtrr.patch)
  nvidia-304xx-lts/repos/extra-x86_64/nvidia-304xx-lts.install
    (from rev 279082, nvidia-304xx-lts/trunk/nvidia-304xx-lts.install)
Deleted:
  nvidia-304xx-lts/repos/extra-i686/PKGBUILD
  nvidia-304xx-lts/repos/extra-i686/disable-mtrr.patch
  nvidia-304xx-lts/repos/extra-i686/nvidia-304xx-lts.install
  nvidia-304xx-lts/repos/extra-x86_64/PKGBUILD
  nvidia-304xx-lts/repos/extra-x86_64/disable-mtrr.patch
  nvidia-304xx-lts/repos/extra-x86_64/nvidia-304xx-lts.install

---------------------------------------+
 /PKGBUILD                             |  128 ++++++++++++++++++++++++++++++++
 /disable-mtrr.patch                   |   48 ++++++++++++
 /nvidia-304xx-lts.install             |   30 +++++++
 extra-i686/PKGBUILD                   |   64 ----------------
 extra-i686/disable-mtrr.patch         |   24 ------
 extra-i686/nvidia-304xx-lts.install   |   15 ---
 extra-x86_64/PKGBUILD                 |   64 ----------------
 extra-x86_64/disable-mtrr.patch       |   24 ------
 extra-x86_64/nvidia-304xx-lts.install |   15 ---
 9 files changed, 206 insertions(+), 206 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-10-21 07:40:51 UTC (rev 279082)
+++ extra-i686/PKGBUILD	2016-10-21 07:41:23 UTC (rev 279083)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=nvidia-304xx-lts
-pkgver=304.131
-_extramodules=extramodules-4.4-lts
-pkgrel=11
-pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux-lts>=4.4.21' 'libgl' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-lts-headers>=4.4.21')
-conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts')
-provides=('nvidia-304xx')
-license=('custom')
-install=nvidia-304xx-lts.install
-options=('!strip')
-#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_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
-#sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
-
-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')
-
-
-if [ "$CARCH" = "i686" ]; then
-  _arch='x86'
-  _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-elif [ "$CARCH" = "x86_64" ]; then
-  _arch='x86_64'
-  _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-fi
-
-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() {
-    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-304xx-lts.conf"
-    echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
-    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-    install -D -m644 ${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx-lts/LICENSE"
-}

Copied: nvidia-304xx-lts/repos/extra-i686/PKGBUILD (from rev 279082, nvidia-304xx-lts/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-10-21 07:41:23 UTC (rev 279083)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=nvidia-304xx-lts
+pkgver=304.132
+_extramodules=extramodules-4.4-lts
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux-lts>=4.4.21' 'libgl' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-lts-headers>=4.4.21')
+conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts')
+provides=('nvidia-304xx')
+license=('custom')
+install=nvidia-304xx-lts.install
+options=('!strip')
+#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_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
+#sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
+
+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=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f'
+            '990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c'
+            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+
+
+if [ "$CARCH" = "i686" ]; then
+  _arch='x86'
+  _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+elif [ "$CARCH" = "x86_64" ]; then
+  _arch='x86_64'
+  _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+fi
+
+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() {
+    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-304xx-lts.conf"
+    echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
+    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+    install -D -m644 ${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx-lts/LICENSE"
+}

Deleted: extra-i686/disable-mtrr.patch
===================================================================
--- extra-i686/disable-mtrr.patch	2016-10-21 07:40:51 UTC (rev 279082)
+++ extra-i686/disable-mtrr.patch	2016-10-21 07:41:23 UTC (rev 279083)
@@ -1,24 +0,0 @@
-Author: Luca Boccassi <luca.boccassi at 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-lts/repos/extra-i686/disable-mtrr.patch (from rev 279082, nvidia-304xx-lts/trunk/disable-mtrr.patch)
===================================================================
--- extra-i686/disable-mtrr.patch	                        (rev 0)
+++ extra-i686/disable-mtrr.patch	2016-10-21 07:41:23 UTC (rev 279083)
@@ -0,0 +1,24 @@
+Author: Luca Boccassi <luca.boccassi at 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-lts.install
===================================================================
--- extra-i686/nvidia-304xx-lts.install	2016-10-21 07:40:51 UTC (rev 279082)
+++ extra-i686/nvidia-304xx-lts.install	2016-10-21 07:41:23 UTC (rev 279083)
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-4.4-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-4.4-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-4.4-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia-304xx-lts/repos/extra-i686/nvidia-304xx-lts.install (from rev 279082, nvidia-304xx-lts/trunk/nvidia-304xx-lts.install)
===================================================================
--- extra-i686/nvidia-304xx-lts.install	                        (rev 0)
+++ extra-i686/nvidia-304xx-lts.install	2016-10-21 07:41:23 UTC (rev 279083)
@@ -0,0 +1,15 @@
+post_install() {
+    EXTRAMODULES='extramodules-4.4-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-4.4-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-4.4-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-10-21 07:40:51 UTC (rev 279082)
+++ extra-x86_64/PKGBUILD	2016-10-21 07:41:23 UTC (rev 279083)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=nvidia-304xx-lts
-pkgver=304.131
-_extramodules=extramodules-4.4-lts
-pkgrel=11
-pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux-lts>=4.4.21' 'libgl' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-lts-headers>=4.4.21')
-conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts')
-provides=('nvidia-304xx')
-license=('custom')
-install=nvidia-304xx-lts.install
-options=('!strip')
-#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_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
-#sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
-
-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')
-
-
-if [ "$CARCH" = "i686" ]; then
-  _arch='x86'
-  _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-elif [ "$CARCH" = "x86_64" ]; then
-  _arch='x86_64'
-  _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-fi
-
-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() {
-    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-304xx-lts.conf"
-    echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
-    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-    install -D -m644 ${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx-lts/LICENSE"
-}

Copied: nvidia-304xx-lts/repos/extra-x86_64/PKGBUILD (from rev 279082, nvidia-304xx-lts/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-10-21 07:41:23 UTC (rev 279083)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=nvidia-304xx-lts
+pkgver=304.132
+_extramodules=extramodules-4.4-lts
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux-lts>=4.4.21' 'libgl' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-lts-headers>=4.4.21')
+conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts')
+provides=('nvidia-304xx')
+license=('custom')
+install=nvidia-304xx-lts.install
+options=('!strip')
+#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_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
+#sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
+
+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=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f'
+            '990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c'
+            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+
+
+if [ "$CARCH" = "i686" ]; then
+  _arch='x86'
+  _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+elif [ "$CARCH" = "x86_64" ]; then
+  _arch='x86_64'
+  _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+fi
+
+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() {
+    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-304xx-lts.conf"
+    echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
+    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+    install -D -m644 ${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx-lts/LICENSE"
+}

Deleted: extra-x86_64/disable-mtrr.patch
===================================================================
--- extra-x86_64/disable-mtrr.patch	2016-10-21 07:40:51 UTC (rev 279082)
+++ extra-x86_64/disable-mtrr.patch	2016-10-21 07:41:23 UTC (rev 279083)
@@ -1,24 +0,0 @@
-Author: Luca Boccassi <luca.boccassi at 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-lts/repos/extra-x86_64/disable-mtrr.patch (from rev 279082, nvidia-304xx-lts/trunk/disable-mtrr.patch)
===================================================================
--- extra-x86_64/disable-mtrr.patch	                        (rev 0)
+++ extra-x86_64/disable-mtrr.patch	2016-10-21 07:41:23 UTC (rev 279083)
@@ -0,0 +1,24 @@
+Author: Luca Boccassi <luca.boccassi at 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-lts.install
===================================================================
--- extra-x86_64/nvidia-304xx-lts.install	2016-10-21 07:40:51 UTC (rev 279082)
+++ extra-x86_64/nvidia-304xx-lts.install	2016-10-21 07:41:23 UTC (rev 279083)
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-4.4-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-4.4-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-4.4-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia-304xx-lts/repos/extra-x86_64/nvidia-304xx-lts.install (from rev 279082, nvidia-304xx-lts/trunk/nvidia-304xx-lts.install)
===================================================================
--- extra-x86_64/nvidia-304xx-lts.install	                        (rev 0)
+++ extra-x86_64/nvidia-304xx-lts.install	2016-10-21 07:41:23 UTC (rev 279083)
@@ -0,0 +1,15 @@
+post_install() {
+    EXTRAMODULES='extramodules-4.4-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-4.4-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-4.4-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

More information about the arch-commits mailing list