Date: Saturday, May 11, 2019 @ 16:12:48 Author: heftig Revision: 352850
archrelease: copy trunk to staging-x86_64 Added: nvidia/repos/staging-x86_64/PKGBUILD (from rev 352849, nvidia/trunk/PKGBUILD) nvidia/repos/staging-x86_64/fs62142.patch (from rev 352849, nvidia/trunk/fs62142.patch) nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 352849, nvidia/trunk/kernel-4.16.patch) Deleted: nvidia/repos/staging-x86_64/PKGBUILD nvidia/repos/staging-x86_64/fs62142.patch nvidia/repos/staging-x86_64/kernel-4.16.patch -------------------+ PKGBUILD | 182 ++++++++++++++++++++++++++-------------------------- fs62142.patch | 26 +++---- kernel-4.16.patch | 66 +++++++++--------- 3 files changed, 137 insertions(+), 137 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-05-11 15:33:28 UTC (rev 352849) +++ PKGBUILD 2019-05-11 16:12:48 UTC (rev 352850) @@ -1,91 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgbase=nvidia -pkgname=(nvidia nvidia-dkms) -pkgver=418.74 -_extramodules=extramodules-ARCH -pkgrel=2 -pkgdesc="NVIDIA drivers for linux" -arch=('x86_64') -url="http://www.nvidia.com/" -makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers') -license=('custom') -options=('!strip') -_pkg="NVIDIA-Linux-x86_64-${pkgver}" -source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" - kernel-4.16.patch - fs62142.patch) -sha512sums=('485d94f0a328c117f86c7b2d8e14885aa1e498755bcc7285aaba1cf5e8f4672feaece7c87a7d0f835c55ff4022d0be6b023ffee262f0a3073ccf88ca1f39201f' - 'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af' - 'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752') - -prepare() { - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - - # Restore phys_to_dma support (still needed for 396.18) - # https://bugs.archlinux.org/task/58074 - patch -Np1 -i ../kernel-4.16.patch - - # 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() { - _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' "nvidia-utils=${pkgver}" 'libglvnd') - - install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -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/staging-x86_64/PKGBUILD (from rev 352849, nvidia/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-05-11 16:12:48 UTC (rev 352850) @@ -0,0 +1,91 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=418.74 +_extramodules=extramodules-ARCH +pkgrel=3 +pkgdesc="NVIDIA drivers for linux" +arch=('x86_64') +url="http://www.nvidia.com/" +makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers') +license=('custom') +options=('!strip') +_pkg="NVIDIA-Linux-x86_64-${pkgver}" +source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" + kernel-4.16.patch + fs62142.patch) +sha512sums=('485d94f0a328c117f86c7b2d8e14885aa1e498755bcc7285aaba1cf5e8f4672feaece7c87a7d0f835c55ff4022d0be6b023ffee262f0a3073ccf88ca1f39201f' + 'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af' + 'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752') + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + + # Restore phys_to_dma support (still needed for 396.18) + # https://bugs.archlinux.org/task/58074 + patch -Np1 -i ../kernel-4.16.patch + + # 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() { + _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' "nvidia-utils=${pkgver}" 'libglvnd') + + install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -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-05-11 15:33:28 UTC (rev 352849) +++ fs62142.patch 2019-05-11 16:12:48 UTC (rev 352850) @@ -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 Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 352849, nvidia/trunk/fs62142.patch) =================================================================== --- fs62142.patch (rev 0) +++ fs62142.patch 2019-05-11 16:12:48 UTC (rev 352850) @@ -0,0 +1,13 @@ +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 Deleted: kernel-4.16.patch =================================================================== --- kernel-4.16.patch 2019-05-11 15:33:28 UTC (rev 352849) +++ kernel-4.16.patch 2019-05-11 16:12:48 UTC (rev 352850) @@ -1,33 +0,0 @@ -diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h -index 10fc418..22ef968 100644 ---- a/kernel/common/inc/nv-linux.h -+++ b/kernel/common/inc/nv-linux.h -@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid) - - #if defined(NV_VM_INSERT_PAGE_PRESENT) - #include <linux/pagemap.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) - #include <linux/dma-mapping.h> -+#else -+#include <linux/dma-direct.h> -+#endif - #endif - - #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64) -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index b23dbb4..42dc576 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -1906,7 +1906,12 @@ compile_test() { - # Determine if the phys_to_dma function is present. - # - CODE=" -+ #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) - #include <linux/dma-mapping.h> -+#else -+ #include <linux/dma-direct.h> -+#endif - void conftest_phys_to_dma(void) { - phys_to_dma(); - }" Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 352849, nvidia/trunk/kernel-4.16.patch) =================================================================== --- kernel-4.16.patch (rev 0) +++ kernel-4.16.patch 2019-05-11 16:12:48 UTC (rev 352850) @@ -0,0 +1,33 @@ +diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h +index 10fc418..22ef968 100644 +--- a/kernel/common/inc/nv-linux.h ++++ b/kernel/common/inc/nv-linux.h +@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid) + + #if defined(NV_VM_INSERT_PAGE_PRESENT) + #include <linux/pagemap.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include <linux/dma-mapping.h> ++#else ++#include <linux/dma-direct.h> ++#endif + #endif + + #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64) +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index b23dbb4..42dc576 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -1906,7 +1906,12 @@ compile_test() { + # Determine if the phys_to_dma function is present. + # + CODE=" ++ #include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include <linux/dma-mapping.h> ++#else ++ #include <linux/dma-direct.h> ++#endif + void conftest_phys_to_dma(void) { + phys_to_dma(); + }"