From 069a451b6e2a70c57d04ddfce91f4402609edfe8fc318c2ea53c96ffdcc52956 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 16 Oct 2024 18:18:20 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=138 --- nvidia-open-driver-G06-signed.changes | 10 ++++++++++ nvidia-open-driver-G06-signed.spec | 6 +++--- preamble | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index 2cca95a..ffc69d6 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 16 17:59:46 UTC 2024 - Stefan Dirsch + +- 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 diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index 266d5ae..eaf0889 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -114,10 +114,10 @@ ExclusiveArch: x86_64 aarch64 %(sed -e '/^%%post\>/ r %_sourcedir/kmp-post.sh' -e '/^%%postun\>/ r %_sourcedir/kmp-postun.sh' %kmp_template_name >%_builddir/nvidia-kmp-template) %if "%{flavor}" == "cuda" %(echo "%triggerin -p /bin/bash -n %%{-n*}-kmp-%1 -- kernel-firmware-nvidia-gspx-G06-cuda = %{version}" >> %_builddir/nvidia-kmp-template) -%else -%(echo "%triggerin -p /bin/bash -n %%{-n*}-kmp-%1 -- kernel-firmware-nvidia-gspx-G06 = %{version}" >> %_builddir/nvidia-kmp-template) +%(cat %_sourcedir/kmp-trigger.sh >> %_builddir/nvidia-kmp-template) %endif -%(cat %_sourcedir/kmp-trigger.sh >> %_builddir/nvidia-kmp-template) +%(echo "%triggerin -p /bin/bash -n %%{-n*}-kmp-%1 -- kernel-firmware-nvidia-gspx-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 \ diff --git a/preamble b/preamble index ee3e19b..9c0d94a 100644 --- a/preamble +++ b/preamble @@ -8,7 +8,7 @@ Provides: nvidia-open-driver-G06-signed-kmp = %{-v*} Provides: nvidia-open-driver-G06-signed-kmp-%1 = %{-v*} Conflicts: nvidia-open-driver-G06-signed-kmp Conflicts: nvidia-open-driver-G06-signed-kmp-%1 -Requires: (kernel-firmware-nvidia-gspx-G06-cuda = %{-v*} if (nvidia-compute-utils-G06 = %{-v*} or sle-module-NVIDIA-compute-release)) +Requires: (kernel-firmware-nvidia-gspx-G06 = %{-v*} if (nvidia-compute-utils-G06 = %{-v*} or sle-module-NVIDIA-compute-release)) %else Requires: (kernel-firmware-nvidia-gspx-G06 = %{-v*} if nvidia-compute-utils-G06 = %{-v*}) %endif