Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package suse-prime for openSUSE:Factory
checked in at 2022-03-08 20:32:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-prime (Old)
and /work/SRC/openSUSE:Factory/.suse-prime.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-prime"
Tue Mar 8 20:32:06 2022 rev:35 rq:960166 version:0.8.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-prime/suse-prime.changes 2022-02-11
23:12:15.863441398 +0100
+++ /work/SRC/openSUSE:Factory/.suse-prime.new.2349/suse-prime.changes
2022-03-11 11:36:25.218278123 +0100
@@ -1,0 +2,5 @@
+Fri Mar 4 15:19:17 UTC 2022 - Martin Wilck <mwi...@suse.com>
+
+- Install modprobe.conf file to %_modprobedir (bsc#1196275, jsc#SLE-20639)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-prime.spec ++++++
--- /var/tmp/diff_new_pack.w73xmQ/_old 2022-03-11 11:36:25.658278640 +0100
+++ /var/tmp/diff_new_pack.w73xmQ/_new 2022-03-11 11:36:25.666278648 +0100
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150300
+# systemd-rpm-macros is wrong in 15.3 and below
+%define _modprobedir /lib/modprobe.d
+%endif
+%global modprobe_d_files 09-nvidia-modprobe-bbswitch-G04.conf
09-nvidia-modprobe-pm-G05.conf
+
Name: suse-prime
Version: 0.8.6
Release: 0
@@ -52,16 +58,13 @@
install -m 0644 xorg-nvidia.conf %{buildroot}%{_datadir}/prime/
install -m 0644 xorg-nvidia-prime-render-offload.conf
%{buildroot}%{_datadir}/prime/
install -m 0644 xorg-amd.conf %{buildroot}%{_datadir}/prime/
+mkdir -p %{buildroot}%{_modprobedir}
+install -m 0644 09-nvidia-modprobe-bbswitch-G04.conf
%{buildroot}%{_modprobedir}/
+install -m 0644 09-nvidia-modprobe-pm-G05.conf %{buildroot}%{_modprobedir}/
%if 0%{?suse_version} >= 1550
-mkdir -p %{buildroot}/usr/lib/modprobe.d
-install -m 0644 09-nvidia-modprobe-bbswitch-G04.conf
%{buildroot}/usr/lib/modprobe.d/
-install -m 0644 09-nvidia-modprobe-pm-G05.conf %{buildroot}/usr/lib/modprobe.d/
mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d/
install -m 0644 90-nvidia-dracut-G05.conf
%{buildroot}/usr/lib/dracut/dracut.conf.d/
%else
-mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
-install -m 0644 09-nvidia-modprobe-bbswitch-G04.conf
%{buildroot}%{_sysconfdir}/modprobe.d
-install -m 0644 09-nvidia-modprobe-pm-G05.conf
%{buildroot}%{_sysconfdir}/modprobe.d
mkdir -p %{buildroot}/etc/dracut.conf.d
install -m 0644 90-nvidia-dracut-G05.conf %{buildroot}/etc/dracut.conf.d
%endif
@@ -75,6 +78,11 @@
%pre
%service_add_pre prime-select.service
+# Avoid restoring outdated stuff in posttrans
+for _f in %{?modprobe_d_files}; do
+ [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
+ mv -f "/etc/modprobe.d/${_f}.rpmsave"
"/etc/modprobe.d/${_f}.rpmsave.old" || :
+done
%post
%{?regenerate_initrd_post}
@@ -97,6 +105,11 @@
fi
%posttrans
+# Migration of modprobe.conf files to _modprobedir
+for _f in %{?modprobe_d_files}; do
+ [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
+ mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || :
+done
%{?regenerate_initrd_posttrans}
%triggerin -- nvidia-gfxG05-kmp-default
@@ -123,13 +136,12 @@
%ghost %config(noreplace) %{_sysconfdir}/prime/current_type
%{_sbindir}/prime-select
%{_sbindir}/rcprime-select
+%dir %{_modprobedir}
+%{_modprobedir}/09-nvidia-modprobe-bbswitch-G04.conf
+%{_modprobedir}/09-nvidia-modprobe-pm-G05.conf
%if 0%{?suse_version} >= 1550
-/usr/lib/modprobe.d/09-nvidia-modprobe-bbswitch-G04.conf
-/usr/lib/modprobe.d/09-nvidia-modprobe-pm-G05.conf
/usr/lib/dracut/dracut.conf.d/90-nvidia-dracut-G05.conf
%else
-%{_sysconfdir}/modprobe.d/09-nvidia-modprobe-bbswitch-G04.conf
-%{_sysconfdir}/modprobe.d/09-nvidia-modprobe-pm-G05.conf
/etc/dracut.conf.d/90-nvidia-dracut-G05.conf
%endif
/usr/lib/udev/rules.d/90-nvidia-udev-pm-G05.rules
