Accepting request 930465 from Base:System

Use _udevrulesdir, fix log msg (forwarded request 930464 from mwilck)

OBS-URL: https://build.opensuse.org/request/show/930465
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-module-tools?expand=0&rev=50

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
-              <param name="changesrevision">78e2a3360cd9727d372174e1ced7f4ad3af01eb8</param></service></servicedata>
+              <param name="changesrevision">5ab3f0d35965bb8b20dbfa1db6f3bfde511abc54</param></service></servicedata>

suse-module-tools-16.0.13.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2eb035bb0a3977e990458155b8921eb14e80a89435b45e959b0ab3f45b25daab
-size 121355

suse-module-tools-16.0.14+2.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3151e3beb84028c002e1e47e01b5730681731f0eeff109da6cd8232dce13bc35
+size 128011

suse-module-tools.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 08 22:05:58 UTC 2021 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 16.0.14:
+  * add udev rules from udev-extra-rules (formerly system-tuning-common-SUSE).
+    Both packages are now obsoleted by suse-module-tools.
+    (jsc#SLE-21032)
+  * 60-io-scheduler.rules: don't use BFQ for real multiqueue devices
+    (jsc#SLE-21032, bsc#1192161)
+  * 60-io-scheduler.rules: use "none" for multipath components
+    (bsc#1192161)
+
 -------------------------------------------------------------------
 Fri Oct 22 20:37:38 UTC 2021 - Martin Wilck <mwilck@suse.com>
 

suse-module-tools.obsinfo

@@ -1,4 +1,5 @@
 name: suse-module-tools
-version: 16.0.13
-mtime: 1634934608
-commit: 78e2a3360cd9727d372174e1ced7f4ad3af01eb8
+version: 16.0.14+2
+mtime: 1636459368
+commit: 5ab3f0d35965bb8b20dbfa1db6f3bfde511abc54
+

suse-module-tools.spec

@@ -45,7 +45,7 @@
 %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
 
 Name:           suse-module-tools
-Version:        16.0.13
+Version:        16.0.14+2
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -65,6 +65,10 @@ Requires(post): /usr/bin/grep
 Requires(post): /usr/bin/sed
 Requires(post): coreutils
 Provides:       suse-kernel-rpm-scriptlets = 0
+Provides:       udev-extra-rules = 0.3.0
+Obsoletes:      udev-extra-rules < 0.3.0
+Provides:       system-tuning-common-SUSE = 0.3.0
+Obsoletes:      system-tuning-common-SUSE < 0.3.0
 # Use weak dependencies for dracut and kmod in order to
 # keep Ring0 lean. In normal deployments, these packages
 # will be available anyway.
@@ -172,6 +176,10 @@ install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
 install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators
 %endif
 
+# udev rules (formerly system-tuning-common-SUSE, udev-extra-rules)
+install -d -m 755 %{buildroot}%{_udevrulesdir}
+install -m 644 udevrules/*.rules %{buildroot}%{_udevrulesdir}
+
 mkdir -p %{buildroot}%{_defaultlicensedir}
 
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
@@ -205,6 +213,7 @@ fi
 exit 0
 
 %post
+%udev_rules_update
 %service_add_post %{systemd_units}
 exit 0
 
@@ -213,6 +222,7 @@ exit 0
 exit 0
 
 %postun
+%udev_rules_update
 %service_del_postun_without_restart %{systemd_units}
 exit 0
 
@@ -248,6 +258,7 @@ exit 0
 %{_unitdir}/*.service
 %{_unitdir}/systemd-sysctl.service.d
 %{_modulesloaddir}
+%{_udevrulesdir}
 %ifarch ppc64 ppc64le
 /usr/lib/systemd/system-generators
 %endif