diff options
author | Daniel Bermond | 2020-07-11 15:12:02 +0000 |
---|---|---|
committer | Daniel Bermond | 2020-07-11 15:12:02 +0000 |
commit | 53d75b1e86bab1c92ee9b64ea6bde9d02f982a99 (patch) | |
tree | 001439bf5981973e210f48286908cc51eb9ea162 | |
parent | 244d0537760704575159fd46eca291b2e29da111 (diff) | |
download | aur-53d75b1e86bab1c92ee9b64ea6bde9d02f982a99.tar.gz |
Updated to version 450.57
-rw-r--r-- | .SRCINFO | 55 | ||||
-rw-r--r-- | 010-nvidia-kernel-5.7.patch | 20 | ||||
-rw-r--r-- | 110-nvidia-change-dkms-conf.patch | 26 | ||||
-rw-r--r-- | 120-nvidia-settings-change-desktop-paths.patch (renamed from 110-nvidia-settings-full-beta-all-change-desktop-paths.patch) | 0 | ||||
-rw-r--r-- | PKGBUILD | 70 | ||||
-rw-r--r-- | nvidia-utils.install (renamed from nvidia-utils-full-beta-all.install) | 0 | ||||
-rw-r--r-- | nvidia-utils.sysusers (renamed from nvidia-utils-full-beta-all.sysusers) | 0 |
7 files changed, 78 insertions, 93 deletions
@@ -1,46 +1,47 @@ pkgbase = nvidia-full-beta-all pkgdesc = Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version) - pkgver = 450.51 - pkgrel = 2 + pkgver = 450.57 + pkgrel = 1 url = https://www.nvidia.com/ arch = x86_64 license = custom makedepends = linux makedepends = linux-headers + makedepends = dkms options = !strip - source = https://us.download.nvidia.com/XFree86/Linux-x86_64/450.51/NVIDIA-Linux-x86_64-450.51.run + source = https://us.download.nvidia.com/XFree86/Linux-x86_64/450.57/NVIDIA-Linux-x86_64-450.57.run source = nvidia-drm-outputclass.conf - source = nvidia-utils-full-beta-all.sysusers - source = 010-nvidia-kernel-5.7.patch - source = 110-nvidia-settings-full-beta-all-change-desktop-paths.patch - sha256sums = c25155bc5ad0121f1665047d5719cb17c60c9453b9a8fad9dea9cb334eaaea9e + source = nvidia-utils.sysusers + source = 110-nvidia-change-dkms-conf.patch + source = 120-nvidia-settings-change-desktop-paths.patch + sha256sums = d50c77fc4fda2a5c5ab2af64524da8a3214077bd7daf0dbf7c1986e0ca05d711 sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d sha256sums = d8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167 - sha256sums = 37cf072fdaee3f9f0c5a8b4d5f2dac722c7b96720fc317bc2da947bde52fb946 - sha256sums = 633bf69c39b8f35d0e64062eb0365c9427c2191583f2daa20b14e51772e8423a + sha256sums = 3f0940fa30468d237cda6cab354b4c40c7baacad5bd5aaf31706740f855e35ce + sha256sums = 6bbc832f4f91a7c9ec4778eac5fffd633f5f547bc2d8bb89afe4f442ad3c8dda pkgname = nvidia-full-beta-all - depends = nvidia-utils-full-beta-all>=450.51 + depends = nvidia-utils-full-beta-all>=450.57 depends = libglvnd - provides = nvidia=450.51 - provides = nvidia-beta=450.51 + provides = nvidia=450.57 + provides = nvidia-beta=450.57 provides = NVIDIA-MODULE conflicts = nvidia pkgname = nvidia-utils-full-beta-all pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta-all' - install = nvidia-utils-full-beta-all.install + install = nvidia-utils.install depends = xorg-server depends = libglvnd depends = egl-wayland optdepends = nvidia-settings-full-beta-all: for the configuration tool optdepends = xorg-server-devel: for nvidia-xconfig optdepends = opencl-nvidia-full-beta-all: for OpenCL support - provides = nvidia-utils=450.51 + provides = nvidia-utils=450.57 provides = vulkan-driver provides = opengl-driver - provides = nvidia-libgl=450.51 - provides = nvidia-libgl-beta=450.51 + provides = nvidia-libgl=450.57 + provides = nvidia-libgl-beta=450.57 conflicts = nvidia-utils conflicts = nvidia-libgl replaces = nvidia-libgl @@ -48,18 +49,18 @@ pkgname = nvidia-utils-full-beta-all pkgname = opencl-nvidia-full-beta-all pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-full-beta-all' depends = zlib - depends = nvidia-utils-full-beta-all>=450.51 + depends = nvidia-utils-full-beta-all>=450.57 optdepends = opencl-headers: headers necessary for OpenCL development - provides = opencl-nvidia=450.51 + provides = opencl-nvidia=450.57 provides = opencl-driver conflicts = opencl-nvidia pkgname = nvidia-settings-full-beta-all pkgdesc = Tool for configuring the NVIDIA graphics driver for 'nvidia-full-beta-all' - depends = nvidia-utils-full-beta-all>=450.51 + depends = nvidia-utils-full-beta-all>=450.57 depends = gtk3 - provides = nvidia-settings=450.51 - provides = nvidia-settings=450.51 + provides = nvidia-settings=450.57 + provides = nvidia-settings=450.57 conflicts = nvidia-settings pkgname = lib32-nvidia-utils-full-beta-all @@ -67,13 +68,13 @@ pkgname = lib32-nvidia-utils-full-beta-all depends = lib32-zlib depends = lib32-gcc-libs depends = lib32-libglvnd - depends = nvidia-utils-full-beta-all>=450.51 + depends = nvidia-utils-full-beta-all>=450.57 optdepends = lib32-opencl-nvidia-full-beta-all: for OpenCL support - provides = lib32-nvidia-utils=450.51 + provides = lib32-nvidia-utils=450.57 provides = lib32-vulkan-driver provides = lib32-opengl-driver - provides = lib32-nvidia-libgl=450.51 - provides = lib32-nvidia-libgl-beta=450.51 + provides = lib32-nvidia-libgl=450.57 + provides = lib32-nvidia-libgl-beta=450.57 conflicts = lib32-nvidia-utils conflicts = lib32-nvidia-libgl replaces = lib32-nvidia-libgl @@ -82,9 +83,9 @@ pkgname = lib32-opencl-nvidia-full-beta-all pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-full-beta-all' depends = lib32-zlib depends = lib32-gcc-libs - depends = lib32-nvidia-utils-full-beta-all>=450.51 + depends = lib32-nvidia-utils-full-beta-all>=450.57 optdepends = opencl-headers: headers necessary for OpenCL development - provides = lib32-opencl-nvidia=450.51 + provides = lib32-opencl-nvidia=450.57 provides = lib32-opencl-driver conflicts = lib32-opencl-nvidia diff --git a/010-nvidia-kernel-5.7.patch b/010-nvidia-kernel-5.7.patch deleted file mode 100644 index d7c58e10d7f0..000000000000 --- a/010-nvidia-kernel-5.7.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -144,6 +144,7 @@ test_headers() { - FILES="$FILES video/nv_internal.h" - FILES="$FILES asm/book3s/64/hash-64k.h" - FILES="$FILES asm/set_memory.h" -+ FILES="$FILES asm/pgtable.h" - FILES="$FILES asm/prom.h" - FILES="$FILES asm/powernv.h" - FILES="$FILES asm/tlbflush.h" -@@ -471,6 +472,9 @@ compile_test() { - # It does not exist on all architectures. - # - CODE=" -+ #if defined(NV_ASM_PGTABLE_H_PRESENT) -+ #include <asm/pgtable.h> -+ #endif - #if defined(NV_ASM_SET_MEMORY_H_PRESENT) - #if defined(NV_ASM_PGTABLE_TYPES_H_PRESENT) - #include <asm/pgtable_types.h> diff --git a/110-nvidia-change-dkms-conf.patch b/110-nvidia-change-dkms-conf.patch new file mode 100644 index 000000000000..c33844d8bf29 --- /dev/null +++ b/110-nvidia-change-dkms-conf.patch @@ -0,0 +1,26 @@ +--- a/kernel/dkms.conf ++++ b/kernel/dkms.conf +@@ -1,12 +1,20 @@ + PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_VERSION="450.57" + AUTOINSTALL="yes" + + # By default, DKMS will add KERNELRELEASE to the make command line; however, + # this will cause the kernel module build to infer that it was invoked via + # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting + # the 'make' command name to suppress this behavior. +-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" + + # The list of kernel modules will be generated by nvidia-installer at runtime. +-__DKMS_MODULES ++BUILT_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" ++ diff --git a/110-nvidia-settings-full-beta-all-change-desktop-paths.patch b/120-nvidia-settings-change-desktop-paths.patch index 97d02f608293..97d02f608293 100644 --- a/110-nvidia-settings-full-beta-all-change-desktop-paths.patch +++ b/120-nvidia-settings-change-desktop-paths.patch @@ -8,25 +8,25 @@ pkgname=('nvidia-full-beta-all' 'nvidia-settings-full-beta-all' 'lib32-nvidia-utils-full-beta-all' 'lib32-opencl-nvidia-full-beta-all') -pkgver=450.51 -pkgrel=2 +pkgver=450.57 +pkgrel=1 pkgdesc='Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version)' arch=('x86_64') url='https://www.nvidia.com/' license=('custom') -makedepends=('linux' 'linux-headers') +makedepends=('linux' 'linux-headers' 'dkms') options=('!strip') _pkg="NVIDIA-Linux-${CARCH}-${pkgver}" source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run" 'nvidia-drm-outputclass.conf' - 'nvidia-utils-full-beta-all.sysusers' - '010-nvidia-kernel-5.7.patch' - '110-nvidia-settings-full-beta-all-change-desktop-paths.patch') -sha256sums=('c25155bc5ad0121f1665047d5719cb17c60c9453b9a8fad9dea9cb334eaaea9e' + 'nvidia-utils.sysusers' + '110-nvidia-change-dkms-conf.patch' + '120-nvidia-settings-change-desktop-paths.patch') +sha256sums=('d50c77fc4fda2a5c5ab2af64524da8a3214077bd7daf0dbf7c1986e0ca05d711' 'be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d' 'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167' - '37cf072fdaee3f9f0c5a8b4d5f2dac722c7b96720fc317bc2da947bde52fb946' - '633bf69c39b8f35d0e64062eb0365c9427c2191583f2daa20b14e51772e8423a') + '3f0940fa30468d237cda6cab354b4c40c7baacad5bd5aaf31706740f855e35ce' + '6bbc832f4f91a7c9ec4778eac5fffd633f5f547bc2d8bb89afe4f442ad3c8dda') # create soname links _create_links() { @@ -47,38 +47,21 @@ prepare() { [ -d "$_pkg" ] && rm -rf "$_pkg" printf '%s\n' " -> Self-Extracting ${_pkg}.run..." sh "${_pkg}.run" --extract-only + bsdtar -C "$_pkg" -xf "${_pkg}/nvidia-persistenced-init.tar.bz2" + gunzip "$_pkg"/nvidia-{cuda-mps-control,modprobe,persistenced,settings,smi,xconfig}.1.gz + ln -s kernel "${_pkg}/nvidia-${pkgver}" - patch -d "$_pkg" -Np1 -i "${srcdir}/010-nvidia-kernel-5.7.patch" - - cd "${_pkg}" - bsdtar -xf nvidia-persistenced-init.tar.bz2 - gunzip nvidia-{cuda-mps-control,modprobe,persistenced,settings,smi,xconfig}.1.gz - mv kernel kernel-orig - - # create a build directory for each installed kernel - local _kernel - local -a _kernels - mapfile -t _kernels < <(find /usr/lib/modules/*/build/version -exec cat {} +) - for _kernel in "${_kernels[@]}" - do - printf '%s\n' " -> Preparing for kernel ${_kernel}" - cp -a kernel-orig "kernel-${_kernel}" - done - - patch -Np1 -i "${srcdir}/110-nvidia-settings-full-beta-all-change-desktop-paths.patch" + patch -d "$_pkg" -Np1 -i "${srcdir}/110-nvidia-change-dkms-conf.patch" + patch -d "$_pkg" -Np1 -i "${srcdir}/120-nvidia-settings-change-desktop-paths.patch" } build() { local _kernel - local -a _kernels - mapfile -t _kernels < <(find /usr/lib/modules/*/build/version -exec cat {} +) - - for _kernel in "${_kernels[@]}" + while read -r _kernel do - cd "${srcdir}/${_pkg}/kernel-${_kernel}" - printf '%s\n' " -> Building Nvidia module for kernel ${_kernel}..." - make SYSSRC="/usr/lib/modules/${_kernel}/build" module - done + printf '%s\n' " -> Building NVIDIA module for kernel ${_kernel}..." + dkms build --dkmstree "$srcdir" --sourcetree "${srcdir}/${_pkg}" -m "nvidia/${pkgver}" -k "$_kernel" + done < <(find /usr/lib/modules/*/build/version -exec cat {} +) } package_nvidia-full-beta-all() { @@ -87,18 +70,13 @@ package_nvidia-full-beta-all() { conflicts=('nvidia') local _kernel - local -a _kernels - mapfile -t _kernels < <(find /usr/lib/modules/*/build/version -exec cat {} +) - - for _kernel in "${_kernels[@]}" + while read -r _kernel do - install -D -m644 "${_pkg}/kernel-${_kernel}/"nvidia{,-drm,-modeset,-uvm}.ko -t "${pkgdir}/usr/lib/modules/${_kernel}/extramodules" - - find "$pkgdir" -name '*.ko' -exec xz -T1 {} + - done + install -D -m644 "nvidia/${pkgver}/${_kernel}/${CARCH}/module"/* -t "${pkgdir}/usr/lib/modules/${_kernel}/extramodules" + done < <(find /usr/lib/modules/*/build/version -exec cat {} +) + find "$pkgdir" -name '*.ko' -exec xz -T1 {} + printf '%s\n' 'blacklist nouveau' | install -D -m644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" - install -D -m644 "${_pkg}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" } @@ -150,7 +128,7 @@ package_nvidia-utils-full-beta-all() { "nvidia-libgl-beta=${pkgver}") conflicts=('nvidia-utils' 'nvidia-libgl') replaces=('nvidia-libgl') - install=nvidia-utils-full-beta-all.install + install=nvidia-utils.install cd "$_pkg" @@ -263,7 +241,7 @@ package_nvidia-utils-full-beta-all() { # distro specific files must be installed in /usr/share/X11/xorg.conf.d install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf" - install -D -m644 "${srcdir}/nvidia-utils-full-beta-all.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + install -D -m644 "${srcdir}/nvidia-utils.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" _create_links } diff --git a/nvidia-utils-full-beta-all.install b/nvidia-utils.install index d87d405aef6d..d87d405aef6d 100644 --- a/nvidia-utils-full-beta-all.install +++ b/nvidia-utils.install diff --git a/nvidia-utils-full-beta-all.sysusers b/nvidia-utils.sysusers index 71c0608911c2..71c0608911c2 100644 --- a/nvidia-utils-full-beta-all.sysusers +++ b/nvidia-utils.sysusers |