Accepting request 1246759 from X11:Drivers:Video:Redesign

- In the module install path revert the order of the 'updates' subdirectory and the package name & version. This satisfies the kmp dependency checker (boo#1237308). -------------------------------------------------------------------- - Add a directory identifying the KMP and its version to the module install path - i.e.: <kernel_version>/nvidia-open-driver-G06-signed-<version>/updates instead of: <kernel_version>/updates This avoids conflicts when a new version is built against the same kernel release. OBS-URL: https://build.opensuse.org/request/show/1246759 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nvidia-open-driver-G06-signed?expand=0&rev=59
- In the module install path revert the order of the 'updates'
2025-02-18 20:03:29 +00:00 · 2025-02-18 18:41:55 +00:00 · 2025-02-18 14:54:28 +00:00 · 2025-02-11 20:29:54 +00:00 · 2025-02-05 12:54:40 +00:00 · 2025-02-03 20:45:27 +00:00
20 changed files with 397 additions and 508 deletions
--- a/kernel-6.10.patch
+++ b/kernel-6.10.patch
@ -1,64 +0,0 @@
--- open-gpu-kernel-modules-555.42.06/kernel-open/conftest.sh	2024-07-10 18:51:10.000000000 +0200
-+++ open-gpu-kernel-modules-560.35.03/kernel-open/conftest.sh	2024-08-19 19:46:21.000000000 +0200
-@@ -5252,25 +5252,23 @@
-             compile_check_conftest "$CODE" "NV_PCI_CLASS_MULTIMEDIA_HD_AUDIO_PRESENT" "" "generic"
-         ;;
- 
-        unsafe_follow_pfn)
-+        follow_pfn)
-             #
-            # Determine if unsafe_follow_pfn() is present.
-+            # Determine if follow_pfn() is present.
-             #
-            # unsafe_follow_pfn() was added by commit 69bacee7f9ad
-            # ("mm: Add unsafe_follow_pfn") in v5.13-rc1.
-            #
-            # Note: this commit never made it to the linux kernel, so
-            # unsafe_follow_pfn() never existed.
-+            # follow_pfn() was added by commit 3b6748e2dd69
-+            # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed
-+            # by commit 233eb0bf3b94 ("mm: remove follow_pfn")
-+            # from linux-next 233eb0bf3b94.
-             #
-             CODE="
-             #include <linux/mm.h>
-            void conftest_unsafe_follow_pfn(void) {
-                unsafe_follow_pfn();
-+            void conftest_follow_pfn(void) {
-+                follow_pfn();
-             }"
- 
-            compile_check_conftest "$CODE" "NV_UNSAFE_FOLLOW_PFN_PRESENT" "" "functions"
-+            compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions"
-         ;;
-
-         drm_plane_atomic_check_has_atomic_state_arg)
-             #
-             # Determine if drm_plane_helper_funcs::atomic_check takes 'state'
--- open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/nvidia.Kbuild	2024-07-10 18:51:10.000000000 +0200
-+++ open-gpu-kernel-modules-560.35.03/kernel-open/nvidia/nvidia.Kbuild	2024-08-19 19:46:21.000000000 +0200
-@@ -161,7 +161,7 @@
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += vga_tryget
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += cc_platform_has
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += seq_read_iter
-NV_CONFTEST_FUNCTION_COMPILE_TESTS += unsafe_follow_pfn
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += follow_pfn
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_get
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += add_memory_driver_managed
--- open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/os-mlock.c.orig	2024-08-28 13:52:38.761337000 +0200
-+++ open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/os-mlock.c	2024-08-28 13:53:44.976357000 +0200
-@@ -36,10 +36,10 @@ static inline int nv_follow_pfn(struct v
-                                 unsigned long address,
-                                 unsigned long *pfn)
- {
-#if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT)
-    return unsafe_follow_pfn(vma, address, pfn);
-#else
-+#if defined(NV_FOLLOW_PFN_PRESENT)
-     return follow_pfn(vma, address, pfn);
-+#else
-+    return -1;
- #endif
- }
- 
--- a/17
+++ b/17
@ -1,18 +1,5 @@
 %defattr (-,root,root)
 %dir %{kernel_module_directory}/%2-%1
 %dir %{kernel_module_directory}/%2-%1/updates
-%{kernel_module_directory}/%2-%1/updates/nvidia*.ko
-%if 0%{?suse_version} >= 1550
-%dir /usr/lib/modprobe.d
-%config /usr/lib/modprobe.d/59-nvidia-%1.conf
-%config /usr/lib/modprobe.d/61-nvidia-%1.conf
-%dir /usr/lib/dracut
-%dir /usr/lib/dracut/dracut.conf.d
-/usr/lib/dracut/dracut.conf.d/60-nvidia-%1.conf
-%else
-%dir %{_sysconfdir}/modprobe.d
-%config %{_sysconfdir}/modprobe.d/59-nvidia-%1.conf
-%config %{_sysconfdir}/modprobe.d/61-nvidia-%1.conf
-%dir /etc/dracut.conf.d
-/etc/dracut.conf.d/60-nvidia-%1.conf
-%endif
+%dir %{kernel_module_directory}/%2-%1/updates/%{name}-%{version}
+%{kernel_module_directory}/%2-%1/updates/%{name}-%{version}/nvidia*.ko
--- a/kmp-post.sh
+++ b/kmp-post.sh
@ -1,29 +0,0 @@
-flavor=%1
-
-# Create symlinks for udev so these devices will get user ACLs by logind later (bnc#1000625)
-mkdir -p /run/udev/static_node-tags/uaccess
-mkdir -p /usr/lib/tmpfiles.d
-ln -snf /dev/nvidiactl /run/udev/static_node-tags/uaccess/nvidiactl 
-ln -snf /dev/nvidia-uvm /run/udev/static_node-tags/uaccess/nvidia-uvm
-ln -snf /dev/nvidia-uvm-tools /run/udev/static_node-tags/uaccess/nvidia-uvm-tools
-ln -snf /dev/nvidia-modeset /run/udev/static_node-tags/uaccess/nvidia-modeset
-cat >  /usr/lib/tmpfiles.d/nvidia-logind-acl-trick-G06.conf << EOF
-L /run/udev/static_node-tags/uaccess/nvidiactl - - - - /dev/nvidiactl
-L /run/udev/static_node-tags/uaccess/nvidia-uvm - - - - /dev/nvidia-uvm
-L /run/udev/static_node-tags/uaccess/nvidia-uvm-tools - - - - /dev/nvidia-uvm-tools
-L /run/udev/static_node-tags/uaccess/nvidia-modeset - - - - /dev/nvidia-modeset
-EOF
-devid=-1
-for dev in $(ls -d /sys/bus/pci/devices/*); do 
-  vendorid=$(cat $dev/vendor)
-  if [ "$vendorid" == "0x10de" ]; then 
-    class=$(cat $dev/class)
-    classid=${class%%00}
-    if [ "$classid" == "0x0300" -o "$classid" == "0x0302" ]; then 
-      devid=$((devid+1))
-      ln -snf /dev/nvidia${devid} /run/udev/static_node-tags/uaccess/nvidia${devid}
-      echo "L /run/udev/static_node-tags/uaccess/nvidia${devid} - - - - /dev/nvidia${devid}" >> /usr/lib/tmpfiles.d/nvidia-logind-acl-trick-G06.conf
-    fi
-  fi
-done
-
--- a/kmp-postun.sh
+++ b/kmp-postun.sh
@ -1,4 +0,0 @@
-if [ "$1" = 0 ] ; then
-    # cleanup of bnc# 1000625
-    rm -f /usr/lib/tmpfiles.d/nvidia-logind-acl-trick-G06.conf
-fi
--- a/kmp-trigger.sh
+++ b/kmp-trigger.sh
@ -0,0 +1,6 @@
+# trigger removal of driver modules with non-existing or wrong
+# firmware when (new) firmware gets installed
+if test -e /sys/module/nvidia \
+    && cat /sys/class/drm/card*/device/vendor | grep -vq 10de; then
+    rmmod nvidia_drm nvidia_uvm nvidia_modeset video nvidia &> /dev/null || true
+fi
--- a/modprobe.nvidia.install
+++ b/modprobe.nvidia.install
@ -1,42 +0,0 @@
-# convert to one line via " awk '{ printf "%s ", $0 }' " script.txt'
-
-PATH=$PATH:/bin:/usr/bin;
-if /sbin/modprobe --ignore-install nvidia NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=$(getent group video | cut -d: -f3) NVreg_DeviceFileMode=0660 NVreg_PreserveVideoMemoryAllocations=1; then
-  if /sbin/modprobe nvidia_uvm; then
-    if [ ! -c /dev/nvidia-uvm ]; then
-      mknod -m 660 /dev/nvidia-uvm c $(cat /proc/devices | while read major device; do if [ "$device" == "nvidia-uvm" ]; then echo $major; break; fi ; done) 0; 
-      chown :video /dev/nvidia-uvm;
-    fi;
-    if [ ! -c /dev/nvidia-uvm-tools ]; then
-      mknod -m 660 /dev/nvidia-uvm-tools c $(cat /proc/devices | while read major device; do if [ "$device" == "nvidia-uvm" ]; then echo $major; break; fi ; done) 1;
-      chown :video /dev/nvidia-uvm-tools;
-    fi;
-  fi;
-  if [ ! -c /dev/nvidiactl ]; then
-    mknod -m 660 /dev/nvidiactl c 195 255;
-    chown :video /dev/nvidiactl;
-  fi;
-  devid=-1;
-  for dev in $(ls -d /sys/bus/pci/devices/*); do 
-    vendorid=$(cat $dev/vendor);
-    if [ "$vendorid" == "0x10de" ]; then
-      class=$(cat $dev/class);
-      classid=${class%%00};
-      if [ "$classid" == "0x0300" -o "$classid" == "0x0302" ]; then 
-        devid=$((devid+1));
-        if [ ! -L /run/udev/static_node-tags/uaccess/nvidia${devid} ]; then 
-          ln -snf /dev/nvidia${devid} /run/udev/static_node-tags/uaccess/nvidia${devid};
-        fi;
-        if [ ! -c /dev/nvidia${devid} ]; then 
-          mknod -m 660 /dev/nvidia${devid} c 195 ${devid}; 
-          chown :video /dev/nvidia${devid};
-        fi;
-      fi;
-    fi;
-  done;
-  /sbin/modprobe nvidia_drm;
-  if [ ! -c /dev/nvidia-modeset ]; then
-    mknod -m 660 /dev/nvidia-modeset c 195 254;
-    chown :video /dev/nvidia-modeset;
-  fi;
-fi
--- a/nvidia-open-driver-G06-signed.changes
+++ b/nvidia-open-driver-G06-signed.changes
@ -1,3 +1,285 @@
+-------------------------------------------------------------------
+Tue Feb 18 17:37:31 UTC 2025 - Egbert Eich <eich@suse.com>
+
+- In the module install path revert the order of the 'updates'
+  subdirectory and the package name & version. This satisfies
+  the kmp dependency checker (boo#1237308).
+
+--------------------------------------------------------------------
+Tue Feb  4 07:39:11 UTC 2025 - Egbert Eich <eich@suse.com>
+
+- Add a directory identifying the KMP and its version to the module
+  install path - i.e.:
+  <kernel_version>/nvidia-open-driver-G06-signed-<version>/updates
+  instead of:
+  <kernel_version>/updates
+  This avoids conflicts when a new version is built against the
+  same kernel release.
+
+-------------------------------------------------------------------
+Tue Feb  4 07:39:11 UTC 2025 - Egbert Eich <eich@suse.com>
+
+- Add a directory identifying the KMP and its version to the module
+  install path - i.e.:
+  <kernel_version>/nvidia-open-driver-G06-signed-<version>/updates
+  instead of:
+  <kernel_version>/updates
+  This avoids conflicts when a new version is built against the
+  same kernel release.
+
+-------------------------------------------------------------------
+Mon Feb  3 14:27:28 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- fixed build against openSUSE:Factory by defining %_builddir
+  if needed (boo#1236746)
+
+-------------------------------------------------------------------
+Mon Feb  3 13:42:45 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- no longer try to patch %post/%postun; no changes needed any longer
+- trigger script needs to be triggered now by nvidia-common-G06,
+  which replaced kernel-firmware-nvidia-gspx-G06{,-cuda} packages
+
+-------------------------------------------------------------------
+Mon Feb  3 12:28:48 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- fixed version of 'Provides: nvidia-open-signed-kmp = <version>'
+  of nvidia-open-signed-cuda-kmp in preamble file
+- fixed 
+  warning: File listed twice: /usr/src/kernel-modules/nvidia-570.86.16-default
+
+-------------------------------------------------------------------
+Tue Jan 28 04:18:18 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- update non-CUDA variant to 570.86.16 (boo#1236658)
+- supersedes aarch64-TW-buildfix.patch
+- supersedes set-FOP_UNSIGNED_OFFSET-for-nv_drm_fops.fop_flags.patch
+
+-------------------------------------------------------------------
+Mon Jan 27 20:39:55 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to 565.77
+- non-CUDA variant:
+  * get rid of modproee.d and dracut.cd files and udev magic; 
+    instead require nvidia-common-G06 
+  * Supplements: switch to really supported devices; not only the
+    initially supported ones without graphical output
+- update non-CUDA and CUDA variant to 570.86.15
+
+-------------------------------------------------------------------
+Wed Jan 22 10:28:07 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- preamble: let -cuda KMP conflict with no-cuda variants < 550.135
+  (bsc#1236191)
+
+-------------------------------------------------------------------
+Tue Jan 14 22:41:54 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to 550.144.03 (bsc#1235461, boo#1235871)
+  * fixes CVE-2024-0131, CVE-2024-0147, CVE-2024-0149,
+    CVE-2024-0150, CVE-2024-53869
+
+-------------------------------------------------------------------
+Sat Jan  4 12:42:00 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- set-FOP_UNSIGNED_OFFSET-for-nv_drm_fops.fop_flags.patch
+  * needed for Kernel 6.12 for 565.57.01 driver; already fixed
+    for 550.142 
+    --> https://forums.developer.nvidia.com/t/patch-for-565-57-01-linux-kernel-6-12/313260 
+
+-------------------------------------------------------------------
+Tue Dec 17 23:51:04 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to 550.142 (boo#1234675)
+
+-------------------------------------------------------------------
+Tue Dec 17 11:55:30 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- for SLE Micro 6.x use 
+  '%if 0%{?suse_version} == 1600 && !0%{?is_opensuse}'; SLE16
+  doesn't set %sle_version and SLE Micro 6.x is already SLE16!
+
+-------------------------------------------------------------------
+Wed Dec 11 00:07:03 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Do not set %{?linux_make_arch} for running make modules/modules-install
+- supersedes 550.135.patch
+
+-------------------------------------------------------------------
+Thu Dec  5 09:38:56 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- obsolete <=560.35.03 -cuda KMPs; mistakenly we released
+  560.35.03 for SP4 ...
+
+-------------------------------------------------------------------
+Wed Dec  4 09:00:04 UTC 2024 - Egbert Eich <eich@suse.com>
+
+- Make sure the correct FW package is installed on non-CUDA.
+
+-------------------------------------------------------------------
+Tue Dec  3 12:17:24 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- kmp-trigger.sh:
+  * avoid to return with exit code != 0 if modules could not be
+    unloaded for some reason
+
+-------------------------------------------------------------------
+Sat Nov 30 12:30:19 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- only obsolete 555 CUDA driver/firmware packages
+
+-------------------------------------------------------------------
+Sat Nov 30 09:21:37 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- preamble:
+  no longer need to provide nvidia-open-driver-G06-kmp because
+  since 565.57.01 to the list of requires of nvidia-compute-G06
+  the -signed packages has been added
+
+-------------------------------------------------------------------
+Sat Nov 30 02:18:26 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- For CUDA update version to 565.57.01
+
+-------------------------------------------------------------------
+Fri Nov 29 10:02:34 UTC 2024 - Egbert Eich <eich@suse.com>
+
+- Add 'dummy' firmware package on SLE to work around update
+  issues. On SLE, the firmware is installed directly from
+  an NVIDIA-hosted repo.
+
+-------------------------------------------------------------------
+Thu Nov 28 12:28:40 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- preamble
+  * resolve self conflicts of -cuda KMP during update by adding
+    obsoletes to older versions (boo#1233332)
+
+-------------------------------------------------------------------
+Mon Nov 25 19:16:46 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- fixed my wrong patch 550.135.patch I introduced right below;
+  it fixed x86_64 build more-or-less accidently but broke aarch64
+  build completely ...
+
+-------------------------------------------------------------------
+Mon Nov 25 13:34:20 UTC 2024 - Egbert Eich <eich@suse.com>
+
+- Improve handling of conflicts between different flavors
+  (gfx vs. CUDA) (bsc#1233332).
+
+-------------------------------------------------------------------
+Mon Nov 25 12:08:18 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to 550.135 (boo#1233673)
+- 550.135.patch: 
+  * fixes wrong logic for checking supported architectures
+
+-------------------------------------------------------------------
+Mon Nov 11 10:32:20 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- kmp-trigger.sh:
+  * avoid to return with exit code != 0 if no modules are loaded
+
+-------------------------------------------------------------------
+Wed Oct 23 02:50:30 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to 550.127.05 (boo#1232057)
+  * Fixed a bug which could cause applications using GBM to crash
+    when running with nvidia-drm.modeset=0.
+
+-------------------------------------------------------------------
+Mon Oct 21 11:32:45 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- cuda-flavor
+  provide also nvidia-open-driver-G06-kmp-$flavor = %version to
+  workaround broken cuda-drivers
+
+-------------------------------------------------------------------
+Fri Oct 18 19:35:16 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- For CUDA update version to 560.35.03 
+- supersedes kernel-6.10.patch
+
+-------------------------------------------------------------------
+Fri Oct 18 13:31:46 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- cuda-flavor
+  * provide nvidia-open-driver-G06-kmp = %version to workaround
+    broken cuda-drivers
+- nv-prefer-signed-open-driver
+  * added comments for requirements
+
+-------------------------------------------------------------------
+Fri Oct 18 12:28:39 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- latest change hardcoded to 555.42.06; we no longer need this 
+  for 560 
+
+-------------------------------------------------------------------
+Fri Oct 18 11:49:46 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- nv-prefer-signed-open-driver:
+  * added specicic versions of cuda-drivers/cuda-drivers-xxx as
+    preconditions for requiring specific version of
+    nvidia-compute-G06 
+
+-------------------------------------------------------------------
+Fri Oct 18 10:30:28 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- nv-prefer-signed-open-driver:
+  * no longer require a specific version of
+    nvidia-open-driver-G06-signed-cuda-kmp, so it can select the
+    correct open driver KMP matching the cuda-runtime version
+- cuda-flavor:
+  * added nvidia-compute-G06 = %version to preconditions for
+    requiring kernel-firmware-nvidia-gspx-G06, since
+    nvidia-compute-utils-G06 does not have a version-specific
+    requires on nvidia-compute-G06
+
+-------------------------------------------------------------------
+Wed Oct 16 17:59:46 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- cuda-flavor: 
+  * require kernel-firmware-nvidia-gspx-G06 instead of 
+    kernel-firmware-nvidia-gspx-G06-cuda (which provides also
+    kernel-firmware-nvidia-gspx-G06)
+  * trigger removal of driver modules also on
+    kernel-firmware-nvidia-gspx-G06
+
+-------------------------------------------------------------------
+Wed Oct 16 12:44:18 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- no longer hard-require kernel firmware package, but install it
+  automatically once nvidia-compute-utils-G06 gets installed
+- trigger removal of driver modules with non-existing or wrong
+  firmware when (new) firmware gets installed
+
+-------------------------------------------------------------------
+Sat Sep 21 12:02:59 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to 550.120 (boo#1230779)
+  * Fixed a bug that could cause kernel crashes upon attempting
+    KMS operations through DRM when nvidia_drm was loaded with
+    modeset=0.
+- aarch64-TW-buildfix.patch
+  * fixes build on aarch64 with latest TW kernel
+
+-------------------------------------------------------------------
+Wed Sep 11 11:15:43 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- CUDA build: removed entries from pci_ids-555.42.06 since this is
+  doing more harm than benefit (bsc#1230368)
+
+-------------------------------------------------------------------
+Mon Sep  9 17:55:56 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- For CUDA (preamble file):
+  * added: Provides: nvidia-open-driver-G06-signed-cuda-kmp-$flavor = %version
+    which is needed for 'zypper install <package> = <version>'
+  * added: Provides/Conflicts: nvidia-open-driver-G06-signed-kmp-$flavor = %version
+    useful for containers
+
 -------------------------------------------------------------------
 Wed Aug 28 11:02:09 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

--- a/nvidia-open-driver-G06-signed.spec
+++ b/nvidia-open-driver-G06-signed.spec
@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package nvidia-open-driver-G06-signed
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,8 +16,8 @@
 #


-%define gfx_version 550.107.02
-%define cuda_version 555.42.06
+%define gfx_version 570.86.16
+%define cuda_version 570.86.15

 %global flavor @BUILD_FLAVOR@%{?nil}
 %if "%{flavor}" == "cuda"
@ -25,6 +25,11 @@
 ExclusiveArch:  do_not_build
 %endif
 %{bcond_without cuda}
+%define mykind cuda
+%define otherkind gfx
+%else
+%define mykind gfx
+%define otherkind cuda
 %endif
 %if %{undefined kernel_module_directory}
 %if 0%{?suse_version} >= 1550
@ -51,24 +56,20 @@ Summary:        NVIDIA open kernel module driver for GeForce 16 series (GTX 16xx
 License:        GPL-2.0-only AND MIT
 Group:          System/Kernel
 URL:            https://github.com/NVIDIA/open-gpu-kernel-modules/
-Source0:        https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{version}.tar.gz#/open-gpu-kernel-modules-%{version}.tar.gz
+#Source0:        https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{version}.tar.gz#/open-gpu-kernel-modules-%{version}.tar.gz
+Source0:        open-gpu-kernel-modules-%{version}.tar.gz
 # This is defined at build, not for 'osc service run download_files` or
 # factory_auto. This both sources are seen outside of the build but only
 # the matching one will be included in the srpm for the respective flavor.
 %if %{undefined linux_arch}
 Source16:       https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{cuda_version}.tar.gz#/open-gpu-kernel-modules-%{cuda_version}.tar.gz
-Source17:       pci_ids-supported-%{cuda_version}
 Source18:       pci_ids-%{cuda_version}
 %endif
 Source1:        my-find-supplements
 Source2:        pci_ids-%{version}
 Source3:        kmp-filelist
-Source4:        kmp-post.sh
-Source5:        kmp-postun.sh
-Source6:        modprobe.nvidia.install
 Source7:        preamble
 Source8:        json-to-pci-id-list.py
-Source9:        pci_ids-supported-%{version}
 # Generate:
 # CUDA_VER=12.5.1; DRIVER_VER=%version; ARCH=...
 # mkdir tmp
@ -80,10 +81,8 @@ Source10:       pci_ids-supported
 Source11:       pesign-copy-sources
 Source12:       pesign-spec-macros
 Source14:       group-source-files.pl
+Source15:       kmp-trigger.sh
 Patch0:         persistent-nvidia-id-string.patch
-%if "%{flavor}" == "cuda"
-Patch1:         kernel-6.10.patch
-%endif
 BuildRequires:  %{kernel_module_package_buildreqs}
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@ -103,7 +102,13 @@ ExclusiveArch:  x86_64 aarch64
 %if 0%{!?kmp_template_name:1}
 %define kmp_template_name /usr/lib/rpm/kernel-module-subpackage
 %endif
-%(sed -e '/^%%post\>/ r %_sourcedir/kmp-post.sh' -e '/^%%postun\>/ r %_sourcedir/kmp-postun.sh' %kmp_template_name >%_builddir/nvidia-kmp-template)
+%if 0%{!?_builddir:1}
+%define _builddir /home/abuild/rpmbuild/BUILD
+%endif
+
+%(cat %kmp_template_name > %_builddir/nvidia-kmp-template)
+%(echo "%triggerin -p /bin/bash -n %%{-n*}-kmp-%1 -- nvidia-common-G06 = %{version}"      >> %_builddir/nvidia-kmp-template)
+%(cat %_sourcedir/kmp-trigger.sh                                                          >> %_builddir/nvidia-kmp-template)
 %kernel_module_package -n %{name} -t %_builddir/nvidia-kmp-template -f %_sourcedir/kmp-filelist -p %_sourcedir/preamble
 %{expand:%(
      for f in %{flavors_to_build}; do \
@ -117,15 +122,38 @@ ExclusiveArch:  x86_64 aarch64
 %package -n nv-prefer-signed-open-driver
 %define version_major %(i=%{version}; echo ${i%%%%.*})
 Summary:        Prefer the signed open driver when installing CUDA
-Requires:       nvidia-open-driver-G06-signed-cuda-kmp = %version
+Requires:       nvidia-open-driver-G06-signed-cuda-kmp
 # This avoids the package being uninstallable when the CUDA repo is unavaliable preventing problems in staging
-Requires:       ( nvidia-compute-G06 = %version if ( cuda-drivers or cuda-drivers-%version_major ) )
+# Hard code version 555.42.06 as this requires is only needed for this version
+# but since this meta package should apply to all versions.
+Requires:       ( nvidia-compute-G06 = 555.42.06 if ( cuda-drivers = 555.42.06 or cuda-drivers-%version_major = 555.42.06) )

 %description -n nv-prefer-signed-open-driver
 By installing this package, the signed NVIDIA open driver built by SUSE will be preferred during installation
 of CUDA components.
 Simply run: `zypper install --no-recommends cuda-runtime-<version> nv-prefer-signed-open-driver`

+%package -n kernel-firmware-nvidia-gspx-G06%{?with_cuda:-cuda}
+Summary:        Kernel firmware file for open NVIDIA kernel module driver G06
+Provides:       multiversion(kernel)
+# Kill version 555 with a 'Conflicts: kernel-firmware-nvidia-gspx-G06'
+Obsoletes:      kernel-firmware-nvidia-gspx-G06 < 560.35.03
+Obsoletes:      kernel-firmware-nvidia-gsp-G06 = 535.86.05
+Obsoletes:      kernel-firmware-nvidia-gspx-G06-cuda < 560.35.03
+Requires:       (kernel-firmware-nvidia-gspx-G06 = %{version} if (nvidia-compute-utils-G06 = %{version} or nvidia-compute-G06 = %{version} or sle-module-NVIDIA-compute-release))
+%if 0%{?sle_version} >= 150700
+BuildArch:      noarch
+%endif
+
+%description -n kernel-firmware-nvidia-gspx-G06%{?with_cuda:-cuda}
+This package fetches the versioned kernel firmware file "gsp.bin" for
+the OpenSource NVIDIA kernel module driver G06 once it's available.
+
+# SLE16 doesn't set %sle_version; SLE Micro 6.x is already SLE16 !!!
+%if (0%{?sle_version:1} || (0%{?suse_version} == 1600 && !0%{?is_opensuse})) && %{with cuda}
+%files -n kernel-firmware-nvidia-gspx-G06%{?with_cuda:-cuda}
+%endif
+
 %if %{with cuda}
 %files -n nv-prefer-signed-open-driver
 %endif
@ -151,6 +179,11 @@ mkdir obj

 pushd %_sourcedir
 chmod 755 my-find-supplements*
+%if %{with cuda}
+# make sure it's empty for -cuda variant
+rm  pci_ids-%{version}
+touch  pci_ids-%{version}
+%endif
 # symlink the %pci_id_file to the one, that rpmbuild generates, to enable my-find-supplement to succeed properly
 # boo#1190210
 ln -sv pci_ids-%{version} pci_ids-%{version}_k%{kbuildver}
@ -175,7 +208,7 @@ for flavor in %{flavors_to_build}; do
 	  export SYSSRC=/usr/src/linux
 	fi
 	export SYSOUT=/usr/src/linux-obj/%_target_cpu/$flavor
-        make %{?_smp_mflags} %{?linux_make_arch} modules
+        make %{?_smp_mflags} modules
        popd
 done

@ -183,7 +216,7 @@ done
 export BRP_PESIGN_FILES="*.ko"
 export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
 export INSTALL_MOD_PATH=%{buildroot}
-export INSTALL_MOD_DIR=updates
+export INSTALL_MOD_DIR=%{kernel_module_package_moddir}/%{name}-%{version}
 for flavor in %{flavors_to_build}; do
 	pushd obj/$flavor
 	if [ -d /usr/src/linux-$flavor ]; then
@ -192,42 +225,15 @@ for flavor in %{flavors_to_build}; do
 	  export SYSSRC=/usr/src/linux
 	fi
 	export SYSOUT=/usr/src/linux-obj/%_target_cpu/$flavor
-        make %{?linux_make_arch} modules_install
+        make modules_install
 	popd
 done

-%if 0%{?suse_version} >= 1550
-MODPROBE_DIR=%{buildroot}/usr/lib/modprobe.d
-%else
-MODPROBE_DIR=%{buildroot}%{_sysconfdir}/modprobe.d
-%endif
-
-mkdir -p $MODPROBE_DIR
-for flavor in %flavors_to_build; do
-    cat > $MODPROBE_DIR/61-nvidia-$flavor.conf << EOF
-blacklist nouveau
-options nvidia-drm modeset=1 fbdev=1
-EOF
-    echo -n "install nvidia " > $MODPROBE_DIR/59-nvidia-$flavor.conf
-    tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/59-nvidia-$flavor.conf
-# otherwise nvidia-uvm is missing in initrd and won't get loaded when nvidia
-# module is loaded in initrd; so better let's load all the nvidia modules
-# later ...
-%if 0%{?suse_version} >= 1550
-  mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d
-  cat  >   %{buildroot}/usr/lib/dracut/dracut.conf.d/60-nvidia-$flavor.conf << EOF
-%else
-  mkdir -p %{buildroot}/etc/dracut.conf.d
-  cat  > %{buildroot}/etc/dracut.conf.d/60-nvidia-$flavor.conf << EOF
-%endif
-omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm "
-EOF
-done
 for flavor in %{flavors_to_build}; do
    mkdir -p %{buildroot}%{_prefix}/src/kernel-modules/nvidia-%{version}-${flavor}
    cp -r source/kernel-open/* %{buildroot}%{_prefix}/src/kernel-modules/nvidia-%{version}-${flavor}
    echo %dir %{_prefix}/src/kernel-modules > files-${flavor}
-    perl %{S:14} -L %{buildroot}%{_prefix}/src/kernel-modules/nvidia-%{version}-${flavor} | sed -e "s@%{buildroot}@@" >> files-${flavor}
+    perl %{S:14} -L %{buildroot}%{_prefix}/src/kernel-modules/nvidia-%{version}-${flavor} | sed -e "s@%{buildroot}@@" | sort -u >> files-${flavor}
    %fdupes -s %{buildroot}%{_prefix}/src/kernel-modules/nvidia-%{version}-${flavor}
 done

--- a/open-gpu-kernel-modules-550.107.02.tar.gz
+++ b/open-gpu-kernel-modules-550.107.02.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b96ed0ab2c9d03f76ff85098d08523d4aaa041c580565a7905fe6add69ba2569
-size 13817082
--- a/open-gpu-kernel-modules-555.42.06.tar.gz
+++ b/open-gpu-kernel-modules-555.42.06.tar.gz
--- a/open-gpu-kernel-modules-570.86.15.tar.gz
+++ b/open-gpu-kernel-modules-570.86.15.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6349304d8c893f451891ff2ae55dccf385a54512bae576bd4e5ed4531927ee66
+size 18648381
--- a/open-gpu-kernel-modules-570.86.16.tar.gz
+++ b/open-gpu-kernel-modules-570.86.16.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86c2141be4173a59fbbebf3540ebb95da754ae1ea9d5ab419134ff7d5dfdf0bf
+size 12997356
--- a/pci_ids-550.107.02
+++ b/pci_ids-550.107.02
@ -1,31 +0,0 @@
-0x1E37 Tesla T10
-0x1EB4 NVIDIA T4G
-0x1EB8 Tesla T4
-0x1EB9 NVIDIA T4 32GB
-0x20B0 NVIDIA A100-PG509-200
-0x20B1 NVIDIA A100-PCIE-40GB
-0x20B2 NVIDIA A100-SXM4-80GB
-0x20B3 NVIDIA PG506-242
-0x20B5 NVIDIA A100-PCIE-80GB
-0x20B6 NVIDIA PG506-230
-0x20B7 NVIDIA A30
-0x20F0 NVIDIA A100-PG506-207
-0x20F1 NVIDIA A100-PCIE-40GB
-0x20F2 NVIDIA A100-PG506-217
-0x20F5 NVIDIA A800-80
-0x20F6 NVIDIA A800-40
-0x2235 NVIDIA A40
-0x2236 NVIDIA A10
-0x2237 NVIDIA A10G
-0x2321 NVIDIA H100 NVL                       
-0x2322 NVIDIA H800 PCIe                      
-0x2324 NVIDIA H800                           
-0x233A NVIDIA H800 NVL
-0x2330 NVIDIA H100 80GB HBM3
-0x2331 NVIDIA H100 PCIe
-0x2339 NVIDIA H100
-0x25B6 NVIDIA A16
-0x26B5 NVIDIA L40
-0x26B8 NVIDIA L40G
-0x27B8 NVIDIA L4
-
--- a/pci_ids-555.42.06
+++ b/pci_ids-555.42.06
@ -1,31 +0,0 @@
-0x1E37 Tesla T10
-0x1EB4 NVIDIA T4G
-0x1EB8 Tesla T4
-0x1EB9 NVIDIA T4 32GB
-0x20B0 NVIDIA A100-PG509-200
-0x20B1 NVIDIA A100-PCIE-40GB
-0x20B2 NVIDIA A100-SXM4-80GB
-0x20B3 NVIDIA PG506-242
-0x20B5 NVIDIA A100-PCIE-80GB
-0x20B6 NVIDIA PG506-230
-0x20B7 NVIDIA A30
-0x20F0 NVIDIA A100-PG506-207
-0x20F1 NVIDIA A100-PCIE-40GB
-0x20F2 NVIDIA A100-PG506-217
-0x20F5 NVIDIA A800-80
-0x20F6 NVIDIA A800-40
-0x2235 NVIDIA A40
-0x2236 NVIDIA A10
-0x2237 NVIDIA A10G
-0x2321 NVIDIA H100 NVL                       
-0x2322 NVIDIA H800 PCIe                      
-0x2324 NVIDIA H800                           
-0x233A NVIDIA H800 NVL
-0x2330 NVIDIA H100 80GB HBM3
-0x2331 NVIDIA H100 PCIe
-0x2339 NVIDIA H100
-0x25B6 NVIDIA A16
-0x26B5 NVIDIA L40
-0x26B8 NVIDIA L40G
-0x27B8 NVIDIA L4
-
--- a/pci_ids-570.86.15
+++ b/pci_ids-570.86.15
--- a/pci_ids-supported-550.107.02
+++ b/pci_ids-supported-550.107.02
@ -1,6 +1,7 @@
 0x1E02 NVIDIA TITAN RTX
 0x1E04 NVIDIA GeForce RTX 2080 Ti
 0x1E07 NVIDIA GeForce RTX 2080 Ti
+0x1E09 NVIDIA CMP 50HX
 0x1E30 Quadro RTX 8000
 0x1E36 Quadro RTX 6000
 0x1E78 Quadro RTX 6000
@ -28,6 +29,7 @@
 0x1F07 NVIDIA GeForce RTX 2070
 0x1F08 NVIDIA GeForce RTX 2060
 0x1F0A NVIDIA GeForce GTX 1650
+0x1F0B NVIDIA CMP 40HX
 0x1F10 NVIDIA GeForce RTX 2070 with Max-Q Design
 0x1F11 NVIDIA GeForce RTX 2060
 0x1F12 NVIDIA GeForce RTX 2060 with Max-Q Design
@ -83,6 +85,7 @@
 0x2184 NVIDIA GeForce GTX 1660
 0x2187 NVIDIA GeForce GTX 1650 SUPER
 0x2188 NVIDIA GeForce GTX 1650
+0x2189 NVIDIA CMP 30HX
 0x2191 NVIDIA GeForce GTX 1660 Ti with Max-Q Design
 0x2192 NVIDIA GeForce GTX 1650 Ti
 0x21C4 NVIDIA GeForce GTX 1660 SUPER
@ -107,12 +110,15 @@
 0x2322 NVIDIA H800 PCIe
 0x2324 NVIDIA H800
 0x2329 NVIDIA H20
+0x232C NVIDIA H20-3e
 0x2330 NVIDIA H100 80GB HBM3
 0x2331 NVIDIA H100 PCIe
 0x2335 NVIDIA H200
 0x2339 NVIDIA H100
 0x233A NVIDIA H800 NVL
+0x233B NVIDIA H200 NVL
 0x2342 NVIDIA GH200 480GB
+0x2348 NVIDIA GH200 144G HBM3e
 0x2414 NVIDIA GeForce RTX 3060 Ti
 0x2420 NVIDIA GeForce RTX 3080 Ti Laptop GPU
 0x2438 NVIDIA RTX A5500 Laptop GPU
@ -184,6 +190,7 @@
 0x25FB NVIDIA RTX A500 Embedded GPU
 0x2684 NVIDIA GeForce RTX 4090
 0x2685 NVIDIA GeForce RTX 4090 D
+0x2689 NVIDIA GeForce RTX 4070 Ti SUPER
 0x26B1 NVIDIA RTX 6000 Ada Generation
 0x26B2 NVIDIA RTX 5000 Ada Generation
 0x26B3 NVIDIA RTX 5880 Ada Generation
@ -222,6 +229,7 @@
 0x2882 NVIDIA GeForce RTX 4060
 0x28A0 NVIDIA GeForce RTX 4060 Laptop GPU
 0x28A1 NVIDIA GeForce RTX 4050 Laptop GPU
+0x28A3 NVIDIA GeForce RTX 3050 A Laptop GPU
 0x28B0 NVIDIA RTX 2000E Ada Generation
 0x28B8 NVIDIA RTX 2000 Ada Generation Laptop GPU
 0x28B9 NVIDIA RTX 1000 Ada Generation Laptop GPU
@ -230,3 +238,7 @@
 0x28E0 NVIDIA GeForce RTX 4060 Laptop GPU
 0x28E1 NVIDIA GeForce RTX 4050 Laptop GPU
 0x28F8 NVIDIA RTX 2000 Ada Generation Embedded GPU
+0x2901 NVIDIA B200
+0x2B85 NVIDIA GeForce RTX 5090
+0x2B87 NVIDIA GeForce RTX 5090 D
+0x2C02 NVIDIA GeForce RTX 5080
--- a/12
+++ b/12
@ -1,6 +1,7 @@
 0x1E02 NVIDIA TITAN RTX
 0x1E04 NVIDIA GeForce RTX 2080 Ti
 0x1E07 NVIDIA GeForce RTX 2080 Ti
+0x1E09 NVIDIA CMP 50HX
 0x1E30 Quadro RTX 8000
 0x1E36 Quadro RTX 6000
 0x1E78 Quadro RTX 6000
@ -28,6 +29,7 @@
 0x1F07 NVIDIA GeForce RTX 2070
 0x1F08 NVIDIA GeForce RTX 2060
 0x1F0A NVIDIA GeForce GTX 1650
+0x1F0B NVIDIA CMP 40HX
 0x1F10 NVIDIA GeForce RTX 2070 with Max-Q Design
 0x1F11 NVIDIA GeForce RTX 2060
 0x1F12 NVIDIA GeForce RTX 2060 with Max-Q Design
@ -83,6 +85,7 @@
 0x2184 NVIDIA GeForce GTX 1660
 0x2187 NVIDIA GeForce GTX 1650 SUPER
 0x2188 NVIDIA GeForce GTX 1650
+0x2189 NVIDIA CMP 30HX
 0x2191 NVIDIA GeForce GTX 1660 Ti with Max-Q Design
 0x2192 NVIDIA GeForce GTX 1650 Ti
 0x21C4 NVIDIA GeForce GTX 1660 SUPER
@ -107,12 +110,15 @@
 0x2322 NVIDIA H800 PCIe
 0x2324 NVIDIA H800
 0x2329 NVIDIA H20
+0x232C NVIDIA H20-3e
 0x2330 NVIDIA H100 80GB HBM3
 0x2331 NVIDIA H100 PCIe
 0x2335 NVIDIA H200
 0x2339 NVIDIA H100
 0x233A NVIDIA H800 NVL
+0x233B NVIDIA H200 NVL
 0x2342 NVIDIA GH200 480GB
+0x2348 NVIDIA GH200 144G HBM3e
 0x2414 NVIDIA GeForce RTX 3060 Ti
 0x2420 NVIDIA GeForce RTX 3080 Ti Laptop GPU
 0x2438 NVIDIA RTX A5500 Laptop GPU
@ -184,6 +190,7 @@
 0x25FB NVIDIA RTX A500 Embedded GPU
 0x2684 NVIDIA GeForce RTX 4090
 0x2685 NVIDIA GeForce RTX 4090 D
+0x2689 NVIDIA GeForce RTX 4070 Ti SUPER
 0x26B1 NVIDIA RTX 6000 Ada Generation
 0x26B2 NVIDIA RTX 5000 Ada Generation
 0x26B3 NVIDIA RTX 5880 Ada Generation
@ -222,6 +229,7 @@
 0x2882 NVIDIA GeForce RTX 4060
 0x28A0 NVIDIA GeForce RTX 4060 Laptop GPU
 0x28A1 NVIDIA GeForce RTX 4050 Laptop GPU
+0x28A3 NVIDIA GeForce RTX 3050 A Laptop GPU
 0x28B0 NVIDIA RTX 2000E Ada Generation
 0x28B8 NVIDIA RTX 2000 Ada Generation Laptop GPU
 0x28B9 NVIDIA RTX 1000 Ada Generation Laptop GPU
@ -230,3 +238,7 @@
 0x28E0 NVIDIA GeForce RTX 4060 Laptop GPU
 0x28E1 NVIDIA GeForce RTX 4050 Laptop GPU
 0x28F8 NVIDIA RTX 2000 Ada Generation Embedded GPU
+0x2901 NVIDIA B200
+0x2B85 NVIDIA GeForce RTX 5090
+0x2B87 NVIDIA GeForce RTX 5090 D
+0x2C02 NVIDIA GeForce RTX 5080
--- a/pci_ids-supported-555.42.06
+++ b/pci_ids-supported-555.42.06
@ -1,232 +0,0 @@
-0x1E02 NVIDIA TITAN RTX
-0x1E04 NVIDIA GeForce RTX 2080 Ti
-0x1E07 NVIDIA GeForce RTX 2080 Ti
-0x1E30 Quadro RTX 8000
-0x1E36 Quadro RTX 6000
-0x1E78 Quadro RTX 6000
-0x1E81 NVIDIA GeForce RTX 2080 SUPER
-0x1E82 NVIDIA GeForce RTX 2080
-0x1E84 NVIDIA GeForce RTX 2070 SUPER
-0x1E87 NVIDIA GeForce RTX 2080
-0x1E89 NVIDIA GeForce RTX 2060
-0x1E90 NVIDIA GeForce RTX 2080 with Max-Q Design
-0x1E91 NVIDIA GeForce RTX 2070 Super with Max-Q Design
-0x1E93 NVIDIA GeForce RTX 2080 Super with Max-Q Design
-0x1EB0 Quadro RTX 5000
-0x1EB1 Quadro RTX 4000
-0x1EB5 Quadro RTX 5000 with Max-Q Design
-0x1EB6 Quadro RTX 4000 with Max-Q Design
-0x1EC2 NVIDIA GeForce RTX 2070 SUPER
-0x1EC7 NVIDIA GeForce RTX 2070 SUPER
-0x1ED0 NVIDIA GeForce RTX 2080 with Max-Q Design
-0x1ED1 NVIDIA GeForce RTX 2070 Super with Max-Q Design
-0x1ED3 NVIDIA GeForce RTX 2080 Super with Max-Q Design
-0x1EF5 Quadro RTX 5000
-0x1F02 NVIDIA GeForce RTX 2070
-0x1F03 NVIDIA GeForce RTX 2060
-0x1F06 NVIDIA GeForce RTX 2060 SUPER
-0x1F07 NVIDIA GeForce RTX 2070
-0x1F08 NVIDIA GeForce RTX 2060
-0x1F0A NVIDIA GeForce GTX 1650
-0x1F10 NVIDIA GeForce RTX 2070 with Max-Q Design
-0x1F11 NVIDIA GeForce RTX 2060
-0x1F12 NVIDIA GeForce RTX 2060 with Max-Q Design
-0x1F14 NVIDIA GeForce RTX 2070 with Max-Q Design
-0x1F15 NVIDIA GeForce RTX 2060
-0x1F36 Quadro RTX 3000 with Max-Q Design
-0x1F42 NVIDIA GeForce RTX 2060 SUPER
-0x1F47 NVIDIA GeForce RTX 2060 SUPER
-0x1F50 NVIDIA GeForce RTX 2070 with Max-Q Design
-0x1F51 NVIDIA GeForce RTX 2060
-0x1F54 NVIDIA GeForce RTX 2070 with Max-Q Design
-0x1F55 NVIDIA GeForce RTX 2060
-0x1F76 Matrox D-Series D2480
-0x1F82 NVIDIA GeForce GTX 1650
-0x1F83 NVIDIA GeForce GTX 1630
-0x1F91 NVIDIA GeForce GTX 1650 with Max-Q Design
-0x1F95 NVIDIA GeForce GTX 1650 Ti with Max-Q Design
-0x1F96 NVIDIA GeForce GTX 1650 with Max-Q Design
-0x1F97 NVIDIA GeForce MX450
-0x1F98 NVIDIA GeForce MX450
-0x1F99 NVIDIA GeForce GTX 1650 with Max-Q Design
-0x1F9C NVIDIA GeForce MX450
-0x1F9D NVIDIA GeForce GTX 1650 with Max-Q Design
-0x1F9F NVIDIA GeForce MX550
-0x1FA0 NVIDIA GeForce MX550
-0x1FB0 NVIDIA T1000
-0x1FB1 NVIDIA T600
-0x1FB2 NVIDIA T400
-0x1FB6 NVIDIA T600 Laptop GPU
-0x1FB7 NVIDIA T550 Laptop GPU
-0x1FB8 Quadro T2000 with Max-Q Design
-0x1FB9 Quadro T1000 with Max-Q Design
-0x1FBA NVIDIA T600 Laptop GPU
-0x1FBB NVIDIA T500
-0x1FBC NVIDIA T1200 Laptop GPU
-0x1FDD NVIDIA GeForce GTX 1650
-0x1FF0 NVIDIA T1000 8GB
-0x1FF2 NVIDIA T400E
-0x1FF9 Quadro T1000
-0x20B0 NVIDIA A100-PG509-200
-0x20B2 NVIDIA PG509-210
-0x20B3 NVIDIA A100-SXM-64GB
-0x20B5 NVIDIA A100 80GB PCIe
-0x20B6 NVIDIA PG506-232
-0x20B7 NVIDIA A30
-0x20BD NVIDIA A800-SXM4-40GB
-0x20F1 NVIDIA A100-PCIE-40GB
-0x20F3 NVIDIA A800-SXM4-80GB
-0x20F5 NVIDIA A800 80GB PCIe LC
-0x20F6 NVIDIA A800 40GB Active
-0x20FD NVIDIA AX800
-0x2182 NVIDIA GeForce GTX 1660 Ti
-0x2184 NVIDIA GeForce GTX 1660
-0x2187 NVIDIA GeForce GTX 1650 SUPER
-0x2188 NVIDIA GeForce GTX 1650
-0x2191 NVIDIA GeForce GTX 1660 Ti with Max-Q Design
-0x2192 NVIDIA GeForce GTX 1650 Ti
-0x21C4 NVIDIA GeForce GTX 1660 SUPER
-0x21D1 NVIDIA GeForce GTX 1660 Ti
-0x2203 NVIDIA GeForce RTX 3090 Ti
-0x2204 NVIDIA GeForce RTX 3090
-0x2206 NVIDIA GeForce RTX 3080
-0x2207 NVIDIA GeForce RTX 3070 Ti
-0x2208 NVIDIA GeForce RTX 3080 Ti
-0x220A NVIDIA GeForce RTX 3080
-0x220D NVIDIA CMP 90HX
-0x2216 NVIDIA GeForce RTX 3080
-0x2230 NVIDIA RTX A6000
-0x2231 NVIDIA RTX A5000
-0x2232 NVIDIA RTX A4500
-0x2233 NVIDIA RTX A5500
-0x2235 NVIDIA A40
-0x2236 NVIDIA A10
-0x2237 NVIDIA A10G
-0x2238 NVIDIA A10M
-0x2321 NVIDIA H100 NVL
-0x2322 NVIDIA H800 PCIe
-0x2324 NVIDIA H800
-0x2329 NVIDIA H20
-0x2330 NVIDIA H100 80GB HBM3
-0x2331 NVIDIA H100 PCIe
-0x2335 NVIDIA H200
-0x2339 NVIDIA H100
-0x233A NVIDIA H800 NVL
-0x2342 NVIDIA GH200 480GB
-0x2414 NVIDIA GeForce RTX 3060 Ti
-0x2420 NVIDIA GeForce RTX 3080 Ti Laptop GPU
-0x2438 NVIDIA RTX A5500 Laptop GPU
-0x2460 NVIDIA GeForce RTX 3080 Ti Laptop GPU
-0x2482 NVIDIA GeForce RTX 3070 Ti
-0x2484 NVIDIA GeForce RTX 3070
-0x2486 NVIDIA GeForce RTX 3060 Ti
-0x2487 NVIDIA GeForce RTX 3060
-0x2488 NVIDIA GeForce RTX 3070
-0x2489 NVIDIA GeForce RTX 3060 Ti
-0x248A NVIDIA CMP 70HX
-0x249C NVIDIA GeForce RTX 3060 Laptop GPU
-0x249D NVIDIA GeForce RTX 3070 Laptop GPU
-0x24A0 NVIDIA GeForce RTX 3060 Laptop GPU
-0x24B0 NVIDIA RTX A4000
-0x24B1 NVIDIA RTX A4000H
-0x24B6 NVIDIA RTX A5000 Laptop GPU
-0x24B7 NVIDIA RTX A4000 Laptop GPU
-0x24B8 NVIDIA RTX A3000 Laptop GPU
-0x24B9 NVIDIA RTX A3000 12GB Laptop GPU
-0x24BA NVIDIA RTX A4500 Laptop GPU
-0x24BB NVIDIA RTX A3000 12GB Laptop GPU
-0x24C7 NVIDIA GeForce RTX 3060
-0x24C9 NVIDIA GeForce RTX 3060 Ti
-0x24DC NVIDIA GeForce RTX 3080 Laptop GPU
-0x24DD NVIDIA GeForce RTX 3070 Laptop GPU
-0x24E0 NVIDIA GeForce RTX 3070 Ti Laptop GPU
-0x24FA NVIDIA RTX A4500 Embedded GPU
-0x2503 NVIDIA GeForce RTX 3060
-0x2504 NVIDIA GeForce RTX 3060
-0x2507 NVIDIA GeForce RTX 3050
-0x2508 NVIDIA GeForce RTX 3050 OEM
-0x2520 NVIDIA GeForce RTX 3060 Laptop GPU
-0x2521 NVIDIA GeForce RTX 3060 Laptop GPU
-0x2523 NVIDIA GeForce RTX 3050 Ti Laptop GPU
-0x2531 NVIDIA RTX A2000
-0x2544 NVIDIA GeForce RTX 3060
-0x2560 NVIDIA GeForce RTX 3060 Laptop GPU
-0x2563 NVIDIA GeForce RTX 3050 Ti Laptop GPU
-0x2571 NVIDIA RTX A2000 12GB
-0x2582 NVIDIA GeForce RTX 3050
-0x2584 NVIDIA GeForce RTX 3050
-0x25A0 NVIDIA GeForce RTX 3060 Laptop GPU
-0x25A2 NVIDIA GeForce RTX 3060 Laptop GPU
-0x25A5 NVIDIA GeForce RTX 3050 Laptop GPU
-0x25A6 NVIDIA GeForce MX570
-0x25A7 NVIDIA GeForce RTX 2050
-0x25A9 NVIDIA GeForce RTX 2050
-0x25AA NVIDIA GeForce MX570 A
-0x25AB NVIDIA GeForce RTX 3050 4GB Laptop GPU
-0x25AC NVIDIA GeForce RTX 3050 6GB Laptop GPU
-0x25AD NVIDIA GeForce RTX 2050
-0x25B0 NVIDIA RTX A1000
-0x25B2 NVIDIA RTX A400
-0x25B6 NVIDIA A2
-0x25B8 NVIDIA RTX A2000 Laptop GPU
-0x25B9 NVIDIA RTX A1000 Laptop GPU
-0x25BA NVIDIA RTX A2000 8GB Laptop GPU
-0x25BB NVIDIA RTX A500 Laptop GPU
-0x25BC NVIDIA RTX A1000 6GB Laptop GPU
-0x25BD NVIDIA RTX A500 Laptop GPU
-0x25E0 NVIDIA GeForce RTX 3050 Ti Laptop GPU
-0x25E2 NVIDIA GeForce RTX 3050 Laptop GPU
-0x25E5 NVIDIA GeForce RTX 3050 Laptop GPU
-0x25EC NVIDIA GeForce RTX 3050 6GB Laptop GPU
-0x25ED NVIDIA GeForce RTX 2050
-0x25F9 NVIDIA RTX A1000 Embedded GPU
-0x25FA NVIDIA RTX A2000 Embedded GPU
-0x25FB NVIDIA RTX A500 Embedded GPU
-0x2684 NVIDIA GeForce RTX 4090
-0x2685 NVIDIA GeForce RTX 4090 D
-0x2689 NVIDIA GeForce RTX 4070 Ti SUPER
-0x26B1 NVIDIA RTX 6000 Ada Generation
-0x26B2 NVIDIA RTX 5000 Ada Generation
-0x26B3 NVIDIA RTX 5880 Ada Generation
-0x26B5 NVIDIA L40
-0x26B9 NVIDIA L40S
-0x26BA NVIDIA L20
-0x2702 NVIDIA GeForce RTX 4080 SUPER
-0x2704 NVIDIA GeForce RTX 4080
-0x2705 NVIDIA GeForce RTX 4070 Ti SUPER
-0x2709 NVIDIA GeForce RTX 4070
-0x2717 NVIDIA GeForce RTX 4090 Laptop GPU
-0x2730 NVIDIA RTX 5000 Ada Generation Laptop GPU
-0x2757 NVIDIA GeForce RTX 4090 Laptop GPU
-0x2770 NVIDIA RTX 5000 Ada Generation Embedded GPU
-0x2782 NVIDIA GeForce RTX 4070 Ti
-0x2783 NVIDIA GeForce RTX 4070 SUPER
-0x2786 NVIDIA GeForce RTX 4070
-0x2788 NVIDIA GeForce RTX 4060 Ti
-0x27A0 NVIDIA GeForce RTX 4080 Laptop GPU
-0x27B0 NVIDIA RTX 4000 SFF Ada Generation
-0x27B1 NVIDIA RTX 4500 Ada Generation
-0x27B2 NVIDIA RTX 4000 Ada Generation
-0x27B6 NVIDIA L2
-0x27B8 NVIDIA L4
-0x27BA NVIDIA RTX 4000 Ada Generation Laptop GPU
-0x27BB NVIDIA RTX 3500 Ada Generation Laptop GPU
-0x27E0 NVIDIA GeForce RTX 4080 Laptop GPU
-0x27FB NVIDIA RTX 3500 Ada Generation Embedded GPU
-0x2803 NVIDIA GeForce RTX 4060 Ti
-0x2805 NVIDIA GeForce RTX 4060 Ti
-0x2808 NVIDIA GeForce RTX 4060
-0x2820 NVIDIA GeForce RTX 4070 Laptop GPU
-0x2838 NVIDIA RTX 3000 Ada Generation Laptop GPU
-0x2860 NVIDIA GeForce RTX 4070 Laptop GPU
-0x2882 NVIDIA GeForce RTX 4060
-0x28A0 NVIDIA GeForce RTX 4060 Laptop GPU
-0x28A1 NVIDIA GeForce RTX 4050 Laptop GPU
-0x28B0 NVIDIA RTX 2000E Ada Generation
-0x28B8 NVIDIA RTX 2000 Ada Generation Laptop GPU
-0x28B9 NVIDIA RTX 1000 Ada Generation Laptop GPU
-0x28BA NVIDIA RTX 500 Ada Generation Laptop GPU
-0x28BB NVIDIA RTX 500 Ada Generation Laptop GPU
-0x28E0 NVIDIA GeForce RTX 4060 Laptop GPU
-0x28E1 NVIDIA GeForce RTX 4050 Laptop GPU
-0x28F8 NVIDIA RTX 2000 Ada Generation Embedded GPU
--- a/persistent-nvidia-id-string.patch
+++ b/persistent-nvidia-id-string.patch
@ -2,9 +2,11 @@
 utils.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/utils.mk
-+++ b/utils.mk
-@@ -524,7 +524,7 @@ define GENERATE_NVIDSTRING
+Index: open-gpu-kernel-modules-550.135/utils.mk
+===================================================================
+--- open-gpu-kernel-modules-550.135.orig/utils.mk
+++ open-gpu-kernel-modules-550.135/utils.mk
+@@ -544,7 +544,7 @@ define GENERATE_NVIDSTRING
   # g_nvid_string.c depends on all objects except g_nvid_string.o, and version.mk
   $(NVIDSTRING): $$(filter-out $$(call BUILD_OBJECT_LIST,$$(NVIDSTRING)), $(3)) $$(VERSION_MK)
 	$(at_if_quiet)$$(MKDIR) $$(dir $$@)
--- a/23
+++ b/23
@ -3,10 +3,25 @@ Conflicts: nvidia-gfxG06-kmp nvidia-driver-G06-kmp nvidia-gfxG05-kmp
 Requires: group(video)
 Provides: nvidia-open-driver-G06 = %{-v*}
 %if %{with cuda}
+Provides: nvidia-open-driver-G06-signed-cuda-kmp-%1 = %{-v*}
+# Provide plain version to simplify installation
 Provides: nvidia-open-driver-G06-signed-kmp = %{-v*}
-Conflicts: nvidia-open-driver-G06-signed-kmp
-Requires: kernel-firmware-nvidia-gspx-G06-cuda = %{-v*}
-%else
-Requires: kernel-firmware-nvidia-gspx-G06 = %{-v*}
+Provides: nvidia-open-driver-G06-signed-kmp-%1 = %{-v*}
+# workaround for broken cuda-drivers
+# resolve self conflicts of -cuda KMP during update by adding
+# obsoletes pre-560/560 version due to its broad conflicts (boo#1233332)
+Obsoletes: nvidia-open-driver-G06-signed-cuda-kmp-%1 <= 560.35.03
+Obsoletes: nvidia-open-driver-G06-signed-cuda-kmp <= 560.35.03
 %endif
+# SLE16 doesn't set %sle_version; SLE Micro 6.x is already SLE16 !!!
+%if (0%{?sle_version:1} || (0%{?suse_version} == 1600 && !0%{?is_opensuse})) && %{with cuda}
+%if 0%{?sle_version} == 150400
+Conflicts: nvidia-driver-G06-signed-kmp-%1 < 550.135
+%endif
+%endif
+Requires: (nvidia-common-G06 = %{-v*} if nvidia-compute-utils-G06 = %{-v*})
+Provides: nvidia-open-signed-kmp = %{-v*}
+Provides:  nvidia-open-signed-kmp(%mykind)
+Conflicts: nvidia-open-signed-kmp(%otherkind)
+
 Obsoletes: nvidia-open-driver-G06 = %{-v*}