rpm/nvidia-open-driver-G06-signed
SHA256
1
0
Fork 0
forked from pool/nvidia-open-driver-G06-signed
Code Pull Requests Activity

- switched from 60-nvidia-$flavor.conf to 61-nvidia-$flavor.conf in

Browse Source 
modprobe.d to resolve conflict with older package, which can be
  installed in parallel

OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=75
This commit is contained in:
Stefan Dirsch 2024-01-25 14:07:27 +00:00 committed by Git OBS Bridge
parent 015e42e466
commit 897f96bd72
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kmp-filelist
View File

@ -4,13 +4,13 @@
%{kernel_module_directory}/%2-%1/updates/nvidia*.ko %{kernel_module_directory}/%2-%1/updates/nvidia*.ko
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
%dir /usr/lib/modprobe.d %dir /usr/lib/modprobe.d
%config /usr/lib/modprobe.d/60-nvidia-%1.conf %config /usr/lib/modprobe.d/61-nvidia-%1.conf
%dir /usr/lib/dracut %dir /usr/lib/dracut
%dir /usr/lib/dracut/dracut.conf.d %dir /usr/lib/dracut/dracut.conf.d
/usr/lib/dracut/dracut.conf.d/60-nvidia-%1.conf /usr/lib/dracut/dracut.conf.d/61-nvidia-%1.conf
%else %else
%dir %{_sysconfdir}/modprobe.d %dir %{_sysconfdir}/modprobe.d
%config %{_sysconfdir}/modprobe.d/60-nvidia-%1.conf %config %{_sysconfdir}/modprobe.d/61-nvidia-%1.conf
%dir /etc/dracut.conf.d %dir /etc/dracut.conf.d
/etc/dracut.conf.d/60-nvidia-%1.conf /etc/dracut.conf.d/61-nvidia-%1.conf
%endif %endif

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

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 25 13:52:41 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- switched from 60-nvidia-$flavor.conf to 61-nvidia-$flavor.conf in
modprobe.d to resolve conflict with older package, which can be
installed in parallel
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 24 13:39:39 UTC 2024 - Stefan Dirsch <sndirsch@suse.com> Wed Jan 24 13:39:39 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

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

@ -158,21 +158,21 @@ MODPROBE_DIR=%{buildroot}%{_sysconfdir}/modprobe.d
mkdir -p $MODPROBE_DIR mkdir -p $MODPROBE_DIR
for flavor in %flavors_to_build; do for flavor in %flavors_to_build; do
cat > $MODPROBE_DIR/60-nvidia-$flavor.conf << EOF cat > $MODPROBE_DIR/61-nvidia-$flavor.conf << EOF
blacklist nouveau blacklist nouveau
options nvidia-drm modeset=1 fbdev=1 options nvidia-drm modeset=1 fbdev=1
EOF EOF
echo -n "install nvidia " >> $MODPROBE_DIR/60-nvidia-$flavor.conf echo -n "install nvidia " >> $MODPROBE_DIR/61-nvidia-$flavor.conf
tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/60-nvidia-$flavor.conf tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/61-nvidia-$flavor.conf
# otherwise nvidia-uvm is missing in initrd and won't get loaded when nvidia # 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 # module is loaded in initrd; so better let's load all the nvidia modules
# later ... # later ...
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d
cat > %{buildroot}/usr/lib/dracut/dracut.conf.d/60-nvidia-$flavor.conf << EOF cat > %{buildroot}/usr/lib/dracut/dracut.conf.d/61-nvidia-$flavor.conf << EOF
%else %else
mkdir -p %{buildroot}/etc/dracut.conf.d mkdir -p %{buildroot}/etc/dracut.conf.d
cat > %{buildroot}/etc/dracut.conf.d/60-nvidia-$flavor.conf << EOF cat > %{buildroot}/etc/dracut.conf.d/61-nvidia-$flavor.conf << EOF
%endif %endif
omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm " omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm "
EOF EOF