diff --git a/kmp-filelist b/kmp-filelist index e40aa5d..40153cd 100644 --- a/kmp-filelist +++ b/kmp-filelist @@ -1,5 +1,6 @@ %defattr (-,root,root) %dir %{kernel_module_directory}/%2-%1 %dir %{kernel_module_directory}/%2-%1/updates -%dir %{kernel_module_directory}/%2-%1/updates/%{name}-%{version} -%{kernel_module_directory}/%2-%1/updates/%{name}-%{version}/nvidia*.ko +# back to updates/ subdir (jsc#PED-12049) +%{kernel_module_directory}/%2-%1/updates/nvidia*.ko + diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index 9be8f09..fbfbe76 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue Sep 23 09:37:01 UTC 2025 - Stefan Dirsch + +- get rid of multiversion for the KMPs, since it only brought/brings + us trouble and no benefit at all (jsc#PED-12049) + * remove any ^Conflicts and ^Provides: multiversion from + /usr/lib/rpm/kernel-module-subpackage + * set INSTALL_MOD_DIR back to %{kernel_module_package_moddir}, i.e. + updates/ subdir + +------------------------------------------------------------------- +Wed Sep 17 12:49:38 UTC 2025 - Stefan Dirsch + +- pesign-spec-macros: added definition for %__kernel_supplements, + which replaced %__kmp_supplements with latest RPM used on TW now, + in order to fix PCI HW Supplements for TW (boo#1249814) + +------------------------------------------------------------------- +Mon Sep 8 08:21:42 UTC 2025 - Stefan Dirsch + +- let conflict CUDA and non-CUDA -devel packages; this is needed + if both have the same version + +------------------------------------------------------------------- +Sun Sep 7 02:48:26 UTC 2025 - Stefan Dirsch + +- update non-CUDA variant to 580.82.07 (boo#1249235) + +------------------------------------------------------------------- +Sat Sep 6 21:31:45 UTC 2025 - Stefan Dirsch + +- update CUDA variant to 580.82.07 + ------------------------------------------------------------------- Thu Aug 14 17:10:25 UTC 2025 - Stefan Dirsch diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index 657ef5f..b7cb72c 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -16,8 +16,8 @@ # -%define gfx_version 580.76.05 -%define cuda_version 580.65.06 +%define gfx_version 580.82.07 +%define cuda_version 580.82.07 %global flavor @BUILD_FLAVOR@%{?nil} %if "%{flavor}" == "cuda" @@ -113,7 +113,8 @@ ExclusiveArch: x86_64 aarch64 %define _sourcedir /home/abuild/rpmbuild/SOURCES %endif -%(sed -e '/^%%post\>/ r %_sourcedir/kmp-post.sh' %kmp_template_name > %_builddir/nvidia-kmp-template) +# also get rid of multiversion (jsc#PED-12049) +%(sed -e '/^%%post\>/ r %_sourcedir/kmp-post.sh' %kmp_template_name | grep -v -e ^Conflicts: -e "^Provides:[[:space:]]*multiversion.*" > %_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) # NOTE: kernel_module_package macro affects preference among nvidia, nvidia-open @@ -125,6 +126,8 @@ ExclusiveArch: x86_64 aarch64 for f in %{flavors_to_build}; do \ echo "%package -n %{name}-${f}-devel"; \ echo "Summary: Devel Package to %name"; \ + echo "Provides: nvidia-open-driver-G06-signed-${f}-devel(%mykind)"; \ + echo "Conflicts: nvidia-open-driver-G06-signed-${f}-devel(%otherkind)"; \ echo "%description -n %{name}-${f}-devel"; \ echo "Provide build requiresments to build against %{name}"; \ echo "%files -n %{name}-${f}-devel -f files-${f}"; \ @@ -206,7 +209,8 @@ done export BRP_PESIGN_FILES="*.ko" export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} export INSTALL_MOD_PATH=%{buildroot} -export INSTALL_MOD_DIR=%{kernel_module_package_moddir}/%{name}-%{version} +# back to updates/ subdir (jsc#PED-12049) +export INSTALL_MOD_DIR=%{kernel_module_package_moddir} for flavor in %{flavors_to_build}; do pushd obj/$flavor if [ -d /usr/src/linux-$flavor ]; then diff --git a/open-gpu-kernel-modules-580.65.06.tar.gz b/open-gpu-kernel-modules-580.65.06.tar.gz deleted file mode 100644 index 02f7edd..0000000 --- a/open-gpu-kernel-modules-580.65.06.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d51ff10da9f25e8e68552069b1eb1bb7d4028123cf24d7f14b6ac541ebdf7225 -size 23710481 diff --git a/open-gpu-kernel-modules-580.76.05.tar.gz b/open-gpu-kernel-modules-580.76.05.tar.gz deleted file mode 100644 index 9060ce5..0000000 --- a/open-gpu-kernel-modules-580.76.05.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f435ab7667d5adb3ba29e528359ef18b8bb9b79e4da4c1ffd8a6381de508302 -size 23719404 diff --git a/open-gpu-kernel-modules-580.82.07.tar.gz b/open-gpu-kernel-modules-580.82.07.tar.gz new file mode 100644 index 0000000..640aab9 --- /dev/null +++ b/open-gpu-kernel-modules-580.82.07.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72ed24d9a042898a2a8549badadba77d773e2d5095955093b99f1085c3622287 +size 23255188 diff --git a/pci_ids-580.76.05 b/pci_ids-580.76.05 deleted file mode 100644 index 473a0f4..0000000 diff --git a/pci_ids-580.65.06 b/pci_ids-580.82.07 similarity index 100% rename from pci_ids-580.65.06 rename to pci_ids-580.82.07 diff --git a/pci_ids-supported b/pci_ids-supported index 9a83a66..56cd95c 100644 --- a/pci_ids-supported +++ b/pci_ids-supported @@ -107,6 +107,7 @@ 0x2236 NVIDIA A10 0x2237 NVIDIA A10G 0x2238 NVIDIA A10M +0x230E NVIDIA H20 NVL16 0x2321 NVIDIA H100 NVL 0x2322 NVIDIA H800 PCIe 0x2324 NVIDIA H800 @@ -242,13 +243,15 @@ 0x28F8 NVIDIA RTX 2000 Ada Generation Embedded GPU 0x2901 NVIDIA B200 0x2941 NVIDIA GB200 +0x29BB NVIDIA DRIVE P2021 0x2B85 NVIDIA GeForce RTX 5090 0x2B87 NVIDIA GeForce RTX 5090 D -0x2B8C NVIDIA GeForce RTX 5090 D V2 +0x2B8C NVIDIA GeForce RTX 5090 D v2 0x2BB1 NVIDIA RTX PRO 6000 Blackwell Workstation Edition 0x2BB3 NVIDIA RTX PRO 5000 Blackwell 0x2BB4 NVIDIA RTX PRO 6000 Blackwell Max-Q Workstation Edition 0x2BB5 NVIDIA RTX PRO 6000 Blackwell Server Edition +0x2BB9 NVIDIA RTX 6000D 0x2C02 NVIDIA GeForce RTX 5080 0x2C05 NVIDIA GeForce RTX 5070 Ti 0x2C18 NVIDIA GeForce RTX 5090 Laptop GPU @@ -277,3 +280,5 @@ 0x2F18 NVIDIA GeForce RTX 5070 Ti Laptop GPU 0x2F38 NVIDIA RTX PRO 3000 Blackwell Generation Laptop GPU 0x2F58 NVIDIA GeForce RTX 5070 Ti Laptop GPU +0x3182 NVIDIA B300 SXM6 AC +0x31C2 NVIDIA GB300 diff --git a/pesign-spec-macros b/pesign-spec-macros index b03fdea..009719a 100644 --- a/pesign-spec-macros +++ b/pesign-spec-macros @@ -1 +1,3 @@ %__kmp_supplements %{_sourcedir}/my-find-supplements %{_sourcedir}/pci_ids-%{version} +%__kernel_supplements %{_sourcedir}/my-find-supplements %{_sourcedir}/pci_ids-%{version} %name +