From 65c73b332292cf97e537ae4c345cf352dc53fe5e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Oct 2022 15:52:07 +0100 Subject: x11-drivers/nvidia-drivers : reorganise things so we support multiple versions --- x11-drivers/nvidia-drivers/files/dkms.patch | 29 ------------------------- x11-drivers/nvidia-drivers/files/dkms390.patch | 28 ++++++++++++++++++++++++ x11-drivers/nvidia-drivers/files/dkms470.patch | 30 ++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 29 deletions(-) delete mode 100644 x11-drivers/nvidia-drivers/files/dkms.patch create mode 100644 x11-drivers/nvidia-drivers/files/dkms390.patch create mode 100644 x11-drivers/nvidia-drivers/files/dkms470.patch (limited to 'x11-drivers/nvidia-drivers/files') diff --git a/x11-drivers/nvidia-drivers/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms.patch deleted file mode 100644 index 3e2a7cd9..00000000 --- a/x11-drivers/nvidia-drivers/files/dkms.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf ---- a/kernel/dkms.conf 2021-07-07 23:03:22.000000000 +0100 -+++ b/kernel/dkms.conf 2021-08-07 22:05:52.634341135 +0100 -@@ -1,12 +1,21 @@ --PACKAGE_NAME="nvidia" --PACKAGE_VERSION="__VERSION_STRING" -+PACKAGE_NAME="nvidia-drivers-dkms" -+PACKAGE_VERSION="470.141.03" - 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]="/extra/dkms" -+BUILT_MODULE_NAME[1]="nvidia-uvm" -+DEST_MODULE_LOCATION[1]="/extra/dkms" -+BUILT_MODULE_NAME[2]="nvidia-modeset" -+DEST_MODULE_LOCATION[2]="/extra/dkms" -+BUILT_MODULE_NAME[3]="nvidia-drm" -+DEST_MODULE_LOCATION[3]="/extra/dkms" -+BUILT_MODULE_NAME[4]="nvidia-peermem" -+DEST_MODULE_LOCATION[4]="/extra/dkms" diff --git a/x11-drivers/nvidia-drivers/files/dkms390.patch b/x11-drivers/nvidia-drivers/files/dkms390.patch new file mode 100644 index 00000000..19e98d8d --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/dkms390.patch @@ -0,0 +1,28 @@ +diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +--- a/kernel/dkms.conf 2021-11-02 06:16:12.000000000 +0000 ++++ b/kernel/dkms.conf 2022-10-16 15:03:27.841471738 +0100 +@@ -1,12 +1,20 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="390.154" ++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # only build for Kernel 5 + 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} 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]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" diff --git a/x11-drivers/nvidia-drivers/files/dkms470.patch b/x11-drivers/nvidia-drivers/files/dkms470.patch new file mode 100644 index 00000000..7ee395df --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/dkms470.patch @@ -0,0 +1,30 @@ +diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +--- a/kernel/dkms.conf 2022-06-30 19:31:05.000000000 +0100 ++++ b/kernel/dkms.conf 2022-10-16 15:06:33.644466229 +0100 +@@ -1,12 +1,22 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="470.141.03" ++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # Only build for kernel 5 + 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]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" ++BUILT_MODULE_NAME[4]="nvidia-peermem" ++DEST_MODULE_LOCATION[4]="/extra/dkms" -- cgit v1.2.3