[arch-commits] Commit in nvidia/repos (12 files)
Felix Yan
fyan at archlinux.org
Wed May 18 14:21:38 UTC 2016
Date: Wednesday, May 18, 2016 @ 16:21:37
Author: fyan
Revision: 268295
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/PKGBUILD
(from rev 268294, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/linux-4.6.patch
(from rev 268294, nvidia/trunk/linux-4.6.patch)
nvidia/repos/testing-i686/nvidia.install
(from rev 268294, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 268294, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/linux-4.6.patch
(from rev 268294, nvidia/trunk/linux-4.6.patch)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 268294, nvidia/trunk/nvidia.install)
Deleted:
nvidia/repos/testing-i686/PKGBUILD
nvidia/repos/testing-i686/linux-4.6.patch
nvidia/repos/testing-i686/nvidia.install
nvidia/repos/testing-x86_64/PKGBUILD
nvidia/repos/testing-x86_64/linux-4.6.patch
nvidia/repos/testing-x86_64/nvidia.install
--------------------------------+
/PKGBUILD | 176 +++++++++++++++++++++++++++++++++++++++
/linux-4.6.patch | 100 ++++++++++++++++++++++
/nvidia.install | 26 +++++
testing-i686/PKGBUILD | 88 -------------------
testing-i686/linux-4.6.patch | 50 -----------
testing-i686/nvidia.install | 13 --
testing-x86_64/PKGBUILD | 88 -------------------
testing-x86_64/linux-4.6.patch | 50 -----------
testing-x86_64/nvidia.install | 13 --
9 files changed, 302 insertions(+), 302 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-05-18 14:20:55 UTC (rev 268294)
+++ testing-i686/PKGBUILD 2016-05-18 14:21:37 UTC (rev 268295)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=364.19
-_extramodules=extramodules-4.6-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7')
-license=('custom')
-options=('!strip')
-source=('linux-4.6.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")
-md5sums=('3064bd437b26adac246f301f54f2814c')
-md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
-md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
-
-[[ "$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}"
- # patches here
- patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
-
- cp -a kernel kernel-dkms
- cd kernel-dkms
- sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
- sed -i 's/__JOBS/`nproc`/' dkms.conf
- sed -i 's/__DKMS_MODULES//' dkms.conf
- sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[2]="nvidia-modeset"\
-DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[3]="nvidia-drm"\
-DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
-}
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
- pkgdesc="NVIDIA drivers for linux"
- depends=('linux>=4.5' 'linux<4.6' "nvidia-utils=${pkgver}" 'libgl')
- install=nvidia.install
-
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko"
-
- if [[ "$CARCH" = "x86_64" ]]; then
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
- fi
-
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
-
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
-
-package_nvidia-dkms() {
- pkgdesc="NVIDIA driver sources for linux"
- depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
- optdepends=('linux-headers: Build the module for Arch kernel'
- 'linux-lts-headers: Build the module for LTS Arch kernel')
- conflicts+=('nvidia')
-
- cd ${_pkg}
- 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/repos/testing-i686/PKGBUILD (from rev 268294, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-05-18 14:21:37 UTC (rev 268295)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=364.19
+_extramodules=extramodules-4.6-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7')
+license=('custom')
+options=('!strip')
+source=('linux-4.6.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")
+md5sums=('3064bd437b26adac246f301f54f2814c')
+md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
+md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
+
+[[ "$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}"
+ # patches here
+ patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
+
+ cp -a kernel kernel-dkms
+ cd kernel-dkms
+ sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+ sed -i 's/__JOBS/`nproc`/' dkms.conf
+ sed -i 's/__DKMS_MODULES//' dkms.conf
+ sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+ pkgdesc="NVIDIA drivers for linux"
+ depends=('linux>=4.6' 'linux<4.7' "nvidia-utils=${pkgver}" 'libgl')
+ install=nvidia.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko"
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ fi
+
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
+
+package_nvidia-dkms() {
+ pkgdesc="NVIDIA driver sources for linux"
+ depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflicts+=('nvidia')
+
+ cd ${_pkg}
+ 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/linux-4.6.patch
===================================================================
--- testing-i686/linux-4.6.patch 2016-05-18 14:20:55 UTC (rev 268294)
+++ testing-i686/linux-4.6.patch 2016-05-18 14:21:37 UTC (rev 268295)
@@ -1,50 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
-@@ -77,7 +77,7 @@
- static struct drm_framebuffer *internal_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
- uint64_t nvkms_params_ptr,
- uint64_t nvkms_params_size
- )
-@@ -199,7 +199,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- )
- {
- return internal_framebuffer_create(dev, file, cmd, 0, 0);
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -45,7 +45,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- );
-
- int nvidia_drm_add_nvkms_fb(
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -31,6 +31,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
-+#include "nv-mm.h"
- #include "nv-pgprot.h"
-
- MODULE_PARM_DESC(
-@@ -121,8 +122,7 @@
-
- down_read(&mm->mmap_sem);
-
-- pages_pinned = get_user_pages(current, mm,
-- address, pages_count, write, force,
-+ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
- user_pages, NULL);
- up_read(&mm->mmap_sem);
\ No newline at end of file
Copied: nvidia/repos/testing-i686/linux-4.6.patch (from rev 268294, nvidia/trunk/linux-4.6.patch)
===================================================================
--- testing-i686/linux-4.6.patch (rev 0)
+++ testing-i686/linux-4.6.patch 2016-05-18 14:21:37 UTC (rev 268295)
@@ -0,0 +1,50 @@
+--- a/kernel/nvidia-drm/nvidia-drm-fb.c
++++ b/kernel/nvidia-drm/nvidia-drm-fb.c
+@@ -77,7 +77,7 @@
+ static struct drm_framebuffer *internal_framebuffer_create
+ (
+ struct drm_device *dev,
+- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
+ uint64_t nvkms_params_ptr,
+ uint64_t nvkms_params_size
+ )
+@@ -199,7 +199,7 @@
+ struct drm_framebuffer *nvidia_drm_framebuffer_create
+ (
+ struct drm_device *dev,
+- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
+ )
+ {
+ return internal_framebuffer_create(dev, file, cmd, 0, 0);
+--- a/kernel/nvidia-drm/nvidia-drm-fb.h
++++ b/kernel/nvidia-drm/nvidia-drm-fb.h
+@@ -45,7 +45,7 @@
+ struct drm_framebuffer *nvidia_drm_framebuffer_create
+ (
+ struct drm_device *dev,
+- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
+ );
+
+ int nvidia_drm_add_nvkms_fb(
+--- a/kernel/nvidia-drm/nvidia-drm-linux.c
++++ b/kernel/nvidia-drm/nvidia-drm-linux.c
+@@ -31,6 +31,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
++#include "nv-mm.h"
+ #include "nv-pgprot.h"
+
+ MODULE_PARM_DESC(
+@@ -121,8 +122,7 @@
+
+ down_read(&mm->mmap_sem);
+
+- pages_pinned = get_user_pages(current, mm,
+- address, pages_count, write, force,
++ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
+ user_pages, NULL);
+ up_read(&mm->mmap_sem);
\ No newline at end of file
Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install 2016-05-18 14:20:55 UTC (rev 268294)
+++ testing-i686/nvidia.install 2016-05-18 14:21:37 UTC (rev 268295)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.6-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/repos/testing-i686/nvidia.install (from rev 268294, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2016-05-18 14:21:37 UTC (rev 268295)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.6-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 2016-05-18 14:20:55 UTC (rev 268294)
+++ testing-x86_64/PKGBUILD 2016-05-18 14:21:37 UTC (rev 268295)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=364.19
-_extramodules=extramodules-4.6-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7')
-license=('custom')
-options=('!strip')
-source=('linux-4.6.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")
-md5sums=('3064bd437b26adac246f301f54f2814c')
-md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
-md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
-
-[[ "$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}"
- # patches here
- patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
-
- cp -a kernel kernel-dkms
- cd kernel-dkms
- sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
- sed -i 's/__JOBS/`nproc`/' dkms.conf
- sed -i 's/__DKMS_MODULES//' dkms.conf
- sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[2]="nvidia-modeset"\
-DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[3]="nvidia-drm"\
-DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
-}
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
- pkgdesc="NVIDIA drivers for linux"
- depends=('linux>=4.5' 'linux<4.6' "nvidia-utils=${pkgver}" 'libgl')
- install=nvidia.install
-
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko"
-
- if [[ "$CARCH" = "x86_64" ]]; then
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
- fi
-
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
-
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
-
-package_nvidia-dkms() {
- pkgdesc="NVIDIA driver sources for linux"
- depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
- optdepends=('linux-headers: Build the module for Arch kernel'
- 'linux-lts-headers: Build the module for LTS Arch kernel')
- conflicts+=('nvidia')
-
- cd ${_pkg}
- 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/repos/testing-x86_64/PKGBUILD (from rev 268294, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-05-18 14:21:37 UTC (rev 268295)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=364.19
+_extramodules=extramodules-4.6-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7')
+license=('custom')
+options=('!strip')
+source=('linux-4.6.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")
+md5sums=('3064bd437b26adac246f301f54f2814c')
+md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
+md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
+
+[[ "$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}"
+ # patches here
+ patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
+
+ cp -a kernel kernel-dkms
+ cd kernel-dkms
+ sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+ sed -i 's/__JOBS/`nproc`/' dkms.conf
+ sed -i 's/__DKMS_MODULES//' dkms.conf
+ sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+ pkgdesc="NVIDIA drivers for linux"
+ depends=('linux>=4.6' 'linux<4.7' "nvidia-utils=${pkgver}" 'libgl')
+ install=nvidia.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko"
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ fi
+
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
+
+package_nvidia-dkms() {
+ pkgdesc="NVIDIA driver sources for linux"
+ depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflicts+=('nvidia')
+
+ cd ${_pkg}
+ 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/linux-4.6.patch
===================================================================
--- testing-x86_64/linux-4.6.patch 2016-05-18 14:20:55 UTC (rev 268294)
+++ testing-x86_64/linux-4.6.patch 2016-05-18 14:21:37 UTC (rev 268295)
@@ -1,50 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
-@@ -77,7 +77,7 @@
- static struct drm_framebuffer *internal_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
- uint64_t nvkms_params_ptr,
- uint64_t nvkms_params_size
- )
-@@ -199,7 +199,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- )
- {
- return internal_framebuffer_create(dev, file, cmd, 0, 0);
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -45,7 +45,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- );
-
- int nvidia_drm_add_nvkms_fb(
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -31,6 +31,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
-+#include "nv-mm.h"
- #include "nv-pgprot.h"
-
- MODULE_PARM_DESC(
-@@ -121,8 +122,7 @@
-
- down_read(&mm->mmap_sem);
-
-- pages_pinned = get_user_pages(current, mm,
-- address, pages_count, write, force,
-+ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
- user_pages, NULL);
- up_read(&mm->mmap_sem);
\ No newline at end of file
Copied: nvidia/repos/testing-x86_64/linux-4.6.patch (from rev 268294, nvidia/trunk/linux-4.6.patch)
===================================================================
--- testing-x86_64/linux-4.6.patch (rev 0)
+++ testing-x86_64/linux-4.6.patch 2016-05-18 14:21:37 UTC (rev 268295)
@@ -0,0 +1,50 @@
+--- a/kernel/nvidia-drm/nvidia-drm-fb.c
++++ b/kernel/nvidia-drm/nvidia-drm-fb.c
+@@ -77,7 +77,7 @@
+ static struct drm_framebuffer *internal_framebuffer_create
+ (
+ struct drm_device *dev,
+- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
+ uint64_t nvkms_params_ptr,
+ uint64_t nvkms_params_size
+ )
+@@ -199,7 +199,7 @@
+ struct drm_framebuffer *nvidia_drm_framebuffer_create
+ (
+ struct drm_device *dev,
+- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
+ )
+ {
+ return internal_framebuffer_create(dev, file, cmd, 0, 0);
+--- a/kernel/nvidia-drm/nvidia-drm-fb.h
++++ b/kernel/nvidia-drm/nvidia-drm-fb.h
+@@ -45,7 +45,7 @@
+ struct drm_framebuffer *nvidia_drm_framebuffer_create
+ (
+ struct drm_device *dev,
+- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
+ );
+
+ int nvidia_drm_add_nvkms_fb(
+--- a/kernel/nvidia-drm/nvidia-drm-linux.c
++++ b/kernel/nvidia-drm/nvidia-drm-linux.c
+@@ -31,6 +31,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
++#include "nv-mm.h"
+ #include "nv-pgprot.h"
+
+ MODULE_PARM_DESC(
+@@ -121,8 +122,7 @@
+
+ down_read(&mm->mmap_sem);
+
+- pages_pinned = get_user_pages(current, mm,
+- address, pages_count, write, force,
++ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
+ user_pages, NULL);
+ up_read(&mm->mmap_sem);
\ No newline at end of file
Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install 2016-05-18 14:20:55 UTC (rev 268294)
+++ testing-x86_64/nvidia.install 2016-05-18 14:21:37 UTC (rev 268295)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.6-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/repos/testing-x86_64/nvidia.install (from rev 268294, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2016-05-18 14:21:37 UTC (rev 268295)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.6-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
+}
More information about the arch-commits
mailing list