From 419a9bcdda61866b6b362fb84c1ac593ee2e4ec53efe5e4984198c643c750726 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Fri, 27 Oct 2023 15:49:25 +0000 Subject: [PATCH] Accepting request 1120836 from home:mwilck:suse-module-tools - Update to version 16.0.38: * modprobe.d: use softdep to load sd_mod and sg (boo#1216070) OBS-URL: https://build.opensuse.org/request/show/1120836 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=173 --- _servicedata | 2 +- suse-module-tools-16.0.37.obscpio | 3 --- suse-module-tools-16.0.38.obscpio | 3 +++ suse-module-tools.changes | 6 ++++++ suse-module-tools.obsinfo | 6 +++--- suse-module-tools.spec | 7 +++++-- 6 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 suse-module-tools-16.0.37.obscpio create mode 100644 suse-module-tools-16.0.38.obscpio diff --git a/_servicedata b/_servicedata index 60ea76d..18940c1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 9b3340f3d7bd08f5112811f78bbd00834e5758bf \ No newline at end of file + a061b1b2a3e52cdbc54d3e24bd3bdacf5b589aba \ No newline at end of file diff --git a/suse-module-tools-16.0.37.obscpio b/suse-module-tools-16.0.37.obscpio deleted file mode 100644 index 430a51f..0000000 --- a/suse-module-tools-16.0.37.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0611d4f37876cba7a79755d92683a1e8ece19cd1fa66f31c19463b0812526095 -size 126987 diff --git a/suse-module-tools-16.0.38.obscpio b/suse-module-tools-16.0.38.obscpio new file mode 100644 index 0000000..e348c6e --- /dev/null +++ b/suse-module-tools-16.0.38.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9c3bd4efe50e45d5dcdb2ba98d56acdd09a767414d4e5788f5881d8bce1b691 +size 126987 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index cb4b79d..02f7814 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 27 15:48:07 UTC 2023 - Martin Wilck + +- Update to version 16.0.38: + * modprobe.d: use softdep to load sd_mod and sg (boo#1216070) + ------------------------------------------------------------------- Wed Oct 25 19:48:57 UTC 2023 - Martin Wilck diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index 66e34e6..f44fb94 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,4 +1,4 @@ name: suse-module-tools -version: 16.0.37 -mtime: 1698263242 -commit: 9b3340f3d7bd08f5112811f78bbd00834e5758bf +version: 16.0.38 +mtime: 1698421623 +commit: a061b1b2a3e52cdbc54d3e24bd3bdacf5b589aba diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 0a9002b..d766877 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -36,7 +36,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.37 +Version: 16.0.38 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -142,7 +142,10 @@ echo 'Wants=boot-sysctl.service' >>"%{buildroot}%{sysctl_dropin}" %endif install -d -m 755 "%{buildroot}%{_modulesloaddir}" -install -pm 644 -t "%{buildroot}%{_modulesloaddir}" modules-load.d/*.conf +for _x in modules-load.d/*.conf; do + [ -e "$_x" ] || continue + install -pm 644 -t "%{buildroot}%{_modulesloaddir}" "$_x" +done %ifarch ppc64 ppc64le install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators