[arch-commits] Commit in nvidia-340xx/repos/testing-x86_64 (4 files)
Giancarlo Razzolini
grazzolini at archlinux.org
Mon Feb 5 14:16:29 UTC 2018
Date: Monday, February 5, 2018 @ 14:16:28
Author: grazzolini
Revision: 315902
archrelease: copy trunk to testing-x86_64
Added:
nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 315901, nvidia-340xx/trunk/PKGBUILD)
nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch
(from rev 315901, nvidia-340xx/trunk/kernel-4.11.patch)
Deleted:
nvidia-340xx/repos/testing-x86_64/PKGBUILD
nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch
-------------------+
PKGBUILD | 142 ++++++++++++++++++++++++++--------------------------
kernel-4.11.patch | 76 +++++++++++++--------------
2 files changed, 109 insertions(+), 109 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-05 14:15:51 UTC (rev 315901)
+++ PKGBUILD 2018-02-05 14:16:28 UTC (rev 315902)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.106
-_extramodules=extramodules-4.15-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-arch=('x86_64')
-url="http://www.nvidia.com/"
-makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 'linux-headers<4.16')
-conflicts=('nvidia')
-license=('custom')
-options=('!strip')
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
- 'kernel-4.11.patch')
-sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
- 'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
-
-_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
-prepare() {
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}"
- # patches here
-
- patch -Np0 < "${srcdir}/kernel-4.11.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
-
- cd uvm
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia-340xx() {
- pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
- depends=('linux>=4.14' 'linux<4.15' "nvidia-340xx-utils=${pkgver}" 'libgl')
-
- install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
- "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
-
- find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
- echo "blacklist nouveau" |
- install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
-
-package_nvidia-340xx-dkms() {
- pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
- depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
- optdepends=('linux-headers: Build the module for Arch kernel'
- 'linux-lts-headers: Build the module for LTS Arch kernel')
- conflicts+=('nvidia-340xx')
-
- cd ${_pkg}
-
- install -dm 755 "${pkgdir}"/usr/src
- cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
- cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-
- echo "blacklist nouveau" |
- install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
Copied: nvidia-340xx/repos/testing-x86_64/PKGBUILD (from rev 315901, nvidia-340xx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-02-05 14:16:28 UTC (rev 315902)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/"
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ 'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+ 'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+
+ patch -Np0 < "${srcdir}/kernel-4.11.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
+
+ cd uvm
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+ pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+ depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+ install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+ "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+ find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+ echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
+
+package_nvidia-340xx-dkms() {
+ pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+ depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflicts+=('nvidia-340xx')
+
+ cd ${_pkg}
+
+ install -dm 755 "${pkgdir}"/usr/src
+ cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+ cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+ echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
Deleted: kernel-4.11.patch
===================================================================
--- kernel-4.11.patch 2018-02-05 14:15:51 UTC (rev 315901)
+++ kernel-4.11.patch 2018-02-05 14:16:28 UTC (rev 315902)
@@ -1,38 +0,0 @@
---- kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:50:46.334075042 +0200
-+++ kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:56:06.358041280 +0200
-@@ -818,7 +818,11 @@
- }
-
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#else
-+int _fault(struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_FAULT_HAS_ADDRESS)
- unsigned long vaddr = vmf->address;
-@@ -828,7 +832,11 @@
- struct page *page = NULL;
- int retval;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- retval = _fault_common(vma, vaddr, &page, vmf->flags);
-+#else
-+ retval = _fault_common(NULL, vaddr, &page, vmf->flags);
-+#endif
-
- vmf->page = page;
-
-@@ -866,7 +874,11 @@
- // it's dealing with anonymous mapping (see handle_pte_fault).
- //
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#else
-+int _sigbus_fault(struct vm_fault *vmf)
-+#endif
- {
- vmf->page = NULL;
- return VM_FAULT_SIGBUS;
Copied: nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch (from rev 315901, nvidia-340xx/trunk/kernel-4.11.patch)
===================================================================
--- kernel-4.11.patch (rev 0)
+++ kernel-4.11.patch 2018-02-05 14:16:28 UTC (rev 315902)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:50:46.334075042 +0200
++++ kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _fault(struct vm_fault *vmf)
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, &page, vmf->flags);
++#else
++ retval = _fault_common(NULL, vaddr, &page, vmf->flags);
++#endif
+
+ vmf->page = page;
+
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;
More information about the arch-commits
mailing list