[arch-commits] Commit in nvidia/repos/testing-x86_64 (PKGBUILD PKGBUILD fs62142.patch)
Jan Steffens
heftig at archlinux.org
Sun Nov 10 15:11:24 UTC 2019
Date: Sunday, November 10, 2019 @ 15:11:23
Author: heftig
Revision: 367682
archrelease: copy trunk to testing-x86_64
Added:
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 367681, nvidia/trunk/PKGBUILD)
Deleted:
nvidia/repos/testing-x86_64/PKGBUILD
nvidia/repos/testing-x86_64/fs62142.patch
---------------+
PKGBUILD | 163 +++++++++++++++++++++++++++-----------------------------
fs62142.patch | 13 ----
2 files changed, 79 insertions(+), 97 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-10 15:11:12 UTC (rev 367681)
+++ PKGBUILD 2019-11-10 15:11:23 UTC (rev 367682)
@@ -1,84 +0,0 @@
-# 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=435.21
-pkgrel=16
-pkgdesc="NVIDIA drivers for linux"
-arch=('x86_64')
-url="https://www.nvidia.com/"
-makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-headers')
-license=('custom')
-options=('!strip')
-_pkg="NVIDIA-Linux-x86_64-${pkgver}"
-source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
- fs62142.patch)
-sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
- 'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
-
-prepare() {
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}"
-
- # Fix https://bugs.archlinux.org/task/62142
- patch -Np1 -i ../fs62142.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
-
- # Gift for linux-rt guys
- sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 NV_EXCLUDE_BUILD_MODULES/' dkms.conf
-}
-
-build() {
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/src/linux module
-}
-
-package_nvidia() {
- pkgdesc="NVIDIA drivers for linux"
- depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
-
- _extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules"
- install -Dt "${pkgdir}${_extradir}" -m644 \
- "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
-
- find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
- echo "blacklist nouveau" |
- install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
- install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
-}
-
-package_nvidia-dkms() {
- pkgdesc="NVIDIA driver sources for linux"
- depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
- optdepends=('linux-headers: Build the module for Arch kernel'
- 'linux-lts-headers: Build the module for LTS Arch kernel')
- provides=("nvidia=$pkgver")
- conflicts+=('nvidia')
-
- cd ${_pkg}
-
- install -dm 755 "${pkgdir}"/usr/src
- cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
-
- echo "blacklist nouveau" |
- install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
- install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
-}
Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 367681, nvidia/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-10 15:11:23 UTC (rev 367682)
@@ -0,0 +1,79 @@
+# 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=435.21
+pkgrel=17
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="https://www.nvidia.com/"
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270')
+
+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
+
+ # Gift for linux-rt guys
+ sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/src/linux module
+}
+
+package_nvidia() {
+ pkgdesc="NVIDIA drivers for linux"
+ depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+ _extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules"
+ install -Dt "${pkgdir}${_extradir}" -m644 \
+ "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+ find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+ echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+ install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+ pkgdesc="NVIDIA driver sources for linux"
+ depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ provides=("nvidia=$pkgver")
+ conflicts+=('nvidia')
+
+ cd ${_pkg}
+
+ install -dm 755 "${pkgdir}"/usr/src
+ cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+
+ echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+ install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
+}
Deleted: fs62142.patch
===================================================================
--- fs62142.patch 2019-11-10 15:11:12 UTC (rev 367681)
+++ fs62142.patch 2019-11-10 15:11:23 UTC (rev 367682)
@@ -1,13 +0,0 @@
-diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
-index 73cdeed..e691014 100644
---- a/kernel/nvidia/nv-dma.c
-+++ b/kernel/nvidia/nv-dma.c
-@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
- #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
- const struct dma_map_ops *ops = get_dma_ops(&nvl->dev->dev);
-
-- return (ops->map_resource != NULL);
-+ return (ops && ops->map_resource);
- #else
- return NV_FALSE;
- #endif
More information about the arch-commits
mailing list