diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | disable-mtrr.patch | 24 |
3 files changed, 14 insertions, 47 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Feb 21 20:20:35 UTC 2017 +# Fri Feb 24 20:41:24 UTC 2017 pkgbase = nvidia-304xx-ck pkgdesc = NVIDIA drivers for linux-ck, 304xx legacy branch. - pkgver = 304.134 - pkgrel = 7 + pkgver = 304.135 + pkgrel = 1 url = http://www.nvidia.com/ install = readme.install arch = i686 @@ -15,18 +15,16 @@ pkgbase = nvidia-304xx-ck depends = linux-ck>=4.9 depends = linux-ck<4.10 depends = libgl - depends = nvidia-304xx-utils=304.134 + depends = nvidia-304xx-utils=304.135 conflicts = nvidia-340xx-ck conflicts = nvidia-ck options = !strip - source = disable-mtrr.patch source = unfuck_kernel_4.9_series.patch - sha256sums = 4263cf19e49acb33ad2641db674ea1eccb71a573300b345636fe99c87fcbdc71 sha256sums = c2e697e56ac1bf418052a24c16c77d5149474b661227c494ce9949d050c2d9c5 - source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/304.134/NVIDIA-Linux-x86-304.134.run - sha256sums_i686 = 84f7891af131bb9f9a8a34401dfef4288218019406dfa4ae57b6d52b14e81c9d - source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/304.134/NVIDIA-Linux-x86_64-304.134-no-compat32.run - sha256sums_x86_64 = 42213765cd28078314657d3c1ba382584f09e5e57598240596021f4f76c0c443 + source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/304.135/NVIDIA-Linux-x86-304.135.run + sha256sums_i686 = 5cb0a191ddca7b4c72b3c26cd57b7d719878ce628d24b5b026a0e5c8d3a00d93 + source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/304.135/NVIDIA-Linux-x86_64-304.135-no-compat32.run + sha256sums_x86_64 = 352f4a4d5ef692b26383e2cf9ec866f6973f905d53eb6bc9f2161b6ba2afae5a pkgname = nvidia-304xx-ck @@ -3,9 +3,9 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=nvidia-304xx-ck -pkgver=304.134 +pkgver=304.135 _extramodules=extramodules-4.9-ck -pkgrel=7 +pkgrel=1 _pkgdesc="NVIDIA drivers for linux-ck, 304xx legacy branch." pkgdesc="$_pkgdesc" arch=('i686' 'x86_64') @@ -18,25 +18,18 @@ conflicts=('nvidia-340xx-ck' 'nvidia-ck') license=('custom') install=readme.install options=(!strip) -source=('disable-mtrr.patch' -'unfuck_kernel_4.9_series.patch' -) +source=('unfuck_kernel_4.9_series.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") -sha256sums=('4263cf19e49acb33ad2641db674ea1eccb71a573300b345636fe99c87fcbdc71' - 'c2e697e56ac1bf418052a24c16c77d5149474b661227c494ce9949d050c2d9c5') -sha256sums_i686=('84f7891af131bb9f9a8a34401dfef4288218019406dfa4ae57b6d52b14e81c9d') -sha256sums_x86_64=('42213765cd28078314657d3c1ba382584f09e5e57598240596021f4f76c0c443') +sha256sums=('c2e697e56ac1bf418052a24c16c77d5149474b661227c494ce9949d050c2d9c5') +sha256sums_i686=('5cb0a191ddca7b4c72b3c26cd57b7d719878ce628d24b5b026a0e5c8d3a00d93') +sha256sums_x86_64=('352f4a4d5ef692b26383e2cf9ec866f6973f905d53eb6bc9f2161b6ba2afae5a') [[ "$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}" - - # FS#47092 - #(cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch) - patch -Np1 -i "$srcdir/disable-mtrr.patch" # FS#52734 patch -Np1 -i "$srcdir/unfuck_kernel_4.9_series.patch" diff --git a/disable-mtrr.patch b/disable-mtrr.patch deleted file mode 100644 index 1a88fc75ece7..000000000000 --- a/disable-mtrr.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Luca Boccassi <luca.boccassi@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/kernel/nv-linux.h -+++ b/kernel/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 |