[arch-commits] Commit in nvidia/repos (12 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Oct 5 10:27:13 UTC 2016
Date: Wednesday, October 5, 2016 @ 10:27:12
Author: tpowa
Revision: 277742
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/PKGBUILD
(from rev 277741, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/fix-abi.patch
(from rev 277741, nvidia/trunk/fix-abi.patch)
nvidia/repos/testing-i686/nvidia.install
(from rev 277741, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 277741, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/fix-abi.patch
(from rev 277741, nvidia/trunk/fix-abi.patch)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 277741, nvidia/trunk/nvidia.install)
Deleted:
nvidia/repos/testing-i686/PKGBUILD
nvidia/repos/testing-i686/fix-abi.patch
nvidia/repos/testing-i686/nvidia.install
nvidia/repos/testing-x86_64/PKGBUILD
nvidia/repos/testing-x86_64/fix-abi.patch
nvidia/repos/testing-x86_64/nvidia.install
-------------------------------+
/PKGBUILD | 168 ++++++++++++++++++++++++++++++++++++++++
/fix-abi.patch | 24 +++++
/nvidia.install | 26 ++++++
testing-i686/PKGBUILD | 84 --------------------
testing-i686/fix-abi.patch | 12 --
testing-i686/nvidia.install | 13 ---
testing-x86_64/PKGBUILD | 84 --------------------
testing-x86_64/fix-abi.patch | 12 --
testing-x86_64/nvidia.install | 13 ---
9 files changed, 218 insertions(+), 218 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-10-05 10:26:46 UTC (rev 277741)
+++ testing-i686/PKGBUILD 2016-10-05 10:27:12 UTC (rev 277742)
@@ -1,84 +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=370.28
-_extramodules=extramodules-4.8-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.8' 'linux-headers<4.9')
-license=('custom')
-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")
-md5sums_i686=('7d3e1c691cd53852f422a93169268178')
-md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75')
-
-[[ "$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}"
-
- 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.8' 'linux<4.9' "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 277741, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-10-05 10:27:12 UTC (rev 277742)
@@ -0,0 +1,84 @@
+# $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=370.28
+_extramodules=extramodules-4.8-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.8' 'linux-headers<4.9')
+license=('custom')
+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")
+md5sums_i686=('7d3e1c691cd53852f422a93169268178')
+md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75')
+
+[[ "$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}"
+
+ 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.8' 'linux<4.9' "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/fix-abi.patch
===================================================================
--- testing-i686/fix-abi.patch 2016-10-05 10:26:46 UTC (rev 277741)
+++ testing-i686/fix-abi.patch 2016-10-05 10:27:12 UTC (rev 277742)
@@ -1,12 +0,0 @@
-diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c
---- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200
-+++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200
-@@ -325,7 +325,7 @@
- struct nvidia_drm_gem_object *nv_gem;
- };
-
--static void nvidia_drm_gem_prime_soft_fence_event
-+static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event
- (
- void *dataPtr,
- NvU32 dataU32
Copied: nvidia/repos/testing-i686/fix-abi.patch (from rev 277741, nvidia/trunk/fix-abi.patch)
===================================================================
--- testing-i686/fix-abi.patch (rev 0)
+++ testing-i686/fix-abi.patch 2016-10-05 10:27:12 UTC (rev 277742)
@@ -0,0 +1,12 @@
+diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c
+--- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200
++++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200
+@@ -325,7 +325,7 @@
+ struct nvidia_drm_gem_object *nv_gem;
+ };
+
+-static void nvidia_drm_gem_prime_soft_fence_event
++static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event
+ (
+ void *dataPtr,
+ NvU32 dataU32
Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install 2016-10-05 10:26:46 UTC (rev 277741)
+++ testing-i686/nvidia.install 2016-10-05 10:27:12 UTC (rev 277742)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.7-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 277741, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2016-10-05 10:27:12 UTC (rev 277742)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.8-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-10-05 10:26:46 UTC (rev 277741)
+++ testing-x86_64/PKGBUILD 2016-10-05 10:27:12 UTC (rev 277742)
@@ -1,84 +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=370.28
-_extramodules=extramodules-4.8-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.8' 'linux-headers<4.9')
-license=('custom')
-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")
-md5sums_i686=('7d3e1c691cd53852f422a93169268178')
-md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75')
-
-[[ "$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}"
-
- 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.8' 'linux<4.9' "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 277741, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-10-05 10:27:12 UTC (rev 277742)
@@ -0,0 +1,84 @@
+# $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=370.28
+_extramodules=extramodules-4.8-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.8' 'linux-headers<4.9')
+license=('custom')
+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")
+md5sums_i686=('7d3e1c691cd53852f422a93169268178')
+md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75')
+
+[[ "$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}"
+
+ 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.8' 'linux<4.9' "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/fix-abi.patch
===================================================================
--- testing-x86_64/fix-abi.patch 2016-10-05 10:26:46 UTC (rev 277741)
+++ testing-x86_64/fix-abi.patch 2016-10-05 10:27:12 UTC (rev 277742)
@@ -1,12 +0,0 @@
-diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c
---- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200
-+++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200
-@@ -325,7 +325,7 @@
- struct nvidia_drm_gem_object *nv_gem;
- };
-
--static void nvidia_drm_gem_prime_soft_fence_event
-+static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event
- (
- void *dataPtr,
- NvU32 dataU32
Copied: nvidia/repos/testing-x86_64/fix-abi.patch (from rev 277741, nvidia/trunk/fix-abi.patch)
===================================================================
--- testing-x86_64/fix-abi.patch (rev 0)
+++ testing-x86_64/fix-abi.patch 2016-10-05 10:27:12 UTC (rev 277742)
@@ -0,0 +1,12 @@
+diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c
+--- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200
++++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200
+@@ -325,7 +325,7 @@
+ struct nvidia_drm_gem_object *nv_gem;
+ };
+
+-static void nvidia_drm_gem_prime_soft_fence_event
++static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event
+ (
+ void *dataPtr,
+ NvU32 dataU32
Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install 2016-10-05 10:26:46 UTC (rev 277741)
+++ testing-x86_64/nvidia.install 2016-10-05 10:27:12 UTC (rev 277742)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.7-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 277741, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2016-10-05 10:27:12 UTC (rev 277742)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.8-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