pool/nvidia-open-driver-G06-signed
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 1242857 from X11:Drivers:Video:Redesign

Browse Source 
- fixed build against openSUSE:Factory by defining %_builddir
  if needed (boo#1236746)

- 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

- 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

OBS-URL: https://build.opensuse.org/request/show/1242857
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nvidia-open-driver-G06-signed?expand=0&rev=57
This commit is contained in:
Ana Guerrero
2025-02-03 20:45:27 +00:00
committed by Git OBS Bridge
parent 605b8299e7 16bbe3d46f
commit 3604554dd7
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nvidia-open-driver-G06-signed.changes
View File

@@ -1,3 +1,24 @@
-------------------------------------------------------------------
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>

14
nvidia-open-driver-G06-signed.spec
View File

@@ -102,13 +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 "%{flavor}" == "cuda"
%(echo "%triggerin -p /bin/bash -n %%{-n*}-kmp-%1 -- kernel-firmware-nvidia-gspx-G06-cuda = %{version}" >> %_builddir/nvidia-kmp-template)
%(cat %_sourcedir/kmp-trigger.sh >> %_builddir/nvidia-kmp-template)
%if 0%{!?_builddir:1}
%define _builddir /home/abuild/rpmbuild/BUILD
%endif
%(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)
%(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 \
@@ -233,7 +233,7 @@ 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

2
preamble
View File

@@ -20,7 +20,7 @@ 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 = %version
Provides: nvidia-open-signed-kmp = %{-v*}
Provides: nvidia-open-signed-kmp(%mykind)
Conflicts: nvidia-open-signed-kmp(%otherkind)