Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package raspberrypi-firmware for openSUSE:Factory checked in at 2022-03-09 18:46:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/raspberrypi-firmware (Old) and /work/SRC/openSUSE:Factory/.raspberrypi-firmware.new.2349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "raspberrypi-firmware" Wed Mar 9 18:46:58 2022 rev:90 rq:960148 version:2022.03.01 Changes: -------- --- /work/SRC/openSUSE:Factory/raspberrypi-firmware/raspberrypi-firmware-config-camera.changes 2022-03-04 00:17:04.604278082 +0100 +++ /work/SRC/openSUSE:Factory/.raspberrypi-firmware.new.2349/raspberrypi-firmware-config-camera.changes 2022-03-11 11:34:49.946166358 +0100 @@ -1,0 +2,5 @@ +Fri Mar 4 17:25:39 UTC 2022 - Martin Wilck <mwi...@suse.com> + +- Install modprobe.conf files to %_modprobedir (bsc#1196275, jsc#SLE-20639) + +------------------------------------------------------------------- raspberrypi-firmware-config.changes: same change raspberrypi-firmware.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ raspberrypi-firmware-config.spec: same change ++++++ raspberrypi-firmware.spec ++++++ --- /var/tmp/diff_new_pack.6QWdgx/_old 2022-03-11 11:34:50.714167258 +0100 +++ /var/tmp/diff_new_pack.6QWdgx/_new 2022-03-11 11:34:50.722167268 +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 50-rpi3.conf + Name: raspberrypi-firmware Version: 2022.03.01 Release: 0 @@ -73,8 +79,8 @@ vm.min_free_kbytes = 2048 EOF -mkdir -p %{buildroot}%{_prefix}/lib/modprobe.d/ -cat > %{buildroot}%{_prefix}/lib/modprobe.d/50-rpi3.conf <<-'EOF' +mkdir -p %{buildroot}%{_modprobedir}/ +cat > %{buildroot}%{_modprobedir}/50-rpi3.conf <<-'EOF' # Prevent too many page allocations (bsc#1012449) options smsc95xx turbo_mode=N EOF @@ -86,6 +92,13 @@ add_drivers+=" pcie-brcmstb " # boo#1162669 EOF +%pre +# 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 if mountpoint -q /boot/efi && [[ ! -L /boot/efi ]]; then for f in start.elf start4.elf fixup.dat fixup4.dat bootcode.bin; do @@ -100,6 +113,13 @@ done 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 + %post extra if mountpoint -q /boot/efi && [[ ! -L /boot/efi ]]; then for suffix in _cd _db _x; do @@ -143,8 +163,8 @@ %dir %{_prefix}/lib/dracut/ %dir %{_prefix}/lib/dracut/dracut.conf.d/ %{_prefix}/lib/dracut/dracut.conf.d/raspberrypi_modules.conf -%dir %{_prefix}/lib/modprobe.d/ -%{_prefix}/lib/modprobe.d/50-rpi3.conf +%dir %{_modprobedir} +%{_modprobedir}/50-rpi3.conf %dir %{_prefix}/lib/sysctl.d/ %{_prefix}/lib/sysctl.d/50-rpi3.conf