diff --git a/_servicedata b/_servicedata index 7a5ff80..8cfdd85 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 532eddd0313f212550d81ad86dfac00b2eeb29fd \ No newline at end of file + 609ed9a25a545c259d8b57f3381093cdefc14e16 \ No newline at end of file diff --git a/suse-module-tools-16.0.10+7.obscpio b/suse-module-tools-16.0.10+7.obscpio new file mode 100644 index 0000000..4e1bf36 --- /dev/null +++ b/suse-module-tools-16.0.10+7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c299209861927f31453b2d8d4785a659ac5c2149e088043e2f0a2d5a8831a58 +size 120843 diff --git a/suse-module-tools-16.0.9.obscpio b/suse-module-tools-16.0.9.obscpio deleted file mode 100644 index 28c2bbb..0000000 --- a/suse-module-tools-16.0.9.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66c4b34ad5f5a9e56b34451eb3bc9861fddfc7ddc334d590787ff3b3b7f3955b -size 103947 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index b6e2b59..a0855a5 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 14 20:53:46 UTC 2021 - obs-service-tar-scm@invalid + +- Update to version 16.0.10+7: + * rpm-script: link config also into /boot (boo#1189879) + * weak-modules2: accept modules under /usr/lib/modules on stdin + (for support of usr-merged KMPs) + * fix scriptlet path (bsc#1189441) + +------------------------------------------------------------------- +Tue Sep 14 14:14:39 UTC 2021 - Martin Wilck + +- Update to version 16.0.10: + * Import kernel scriptlets from kernel-source (bsc#1189441) + * README.md: document environment variables for weak-modules2 + ------------------------------------------------------------------- Mon Aug 30 13:15:20 UTC 2021 - Martin Wilck diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index b7dc532..cb0292b 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.0.9 -mtime: 1630329092 -commit: 532eddd0313f212550d81ad86dfac00b2eeb29fd +version: 16.0.10+7 +mtime: 1631652821 +commit: 5d5787e794ec54d5f0a364363a42864eca79eacc diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 9ac752a..31a0400 100644 --- a/suse-module-tools.spec +++ b/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.9 +Version: 16.0.10+7 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -64,6 +64,7 @@ Requires: rpm Requires(post): /usr/bin/grep Requires(post): /usr/bin/sed Requires(post): coreutils +Provides: suse-kernel-rpm-scriptlets = 0 # Use weak dependencies for dracut and kmod in order to # keep Ring0 lean. In normal deployments, these packages # will be available anyway. @@ -79,8 +80,7 @@ Conflicts: filesystem < 15.5-40.2 %description This package contains helper scripts for KMP installation and uninstallation, as well as default configuration files for depmod and -modprobe. These utilities are provided by kmod-compat or -module-init-tools, whichever implementation you choose to install. +modprobe. %package legacy @@ -136,6 +136,17 @@ install -d -m 755 "%{buildroot}%{_rpmmacrodir}" install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" %endif install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" +install -d -m 755 "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" +install -pm 755 "kernel-scriptlets/cert-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" +install -pm 755 "kernel-scriptlets/inkmp-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" +install -pm 755 "kernel-scriptlets/kmp-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" +install -pm 755 "kernel-scriptlets/rpm-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" +for i in "pre" "preun" "post" "posttrans" "postun" ; do + ln -s cert-script %{buildroot}/usr/lib/module-init-tools/kernel-scriptlets/cert-$i + ln -s inkmp-script %{buildroot}/usr/lib/module-init-tools/kernel-scriptlets/inkmp-$i + ln -s kmp-script %{buildroot}/usr/lib/module-init-tools/kernel-scriptlets/kmp-$i + ln -s rpm-script %{buildroot}/usr/lib/module-init-tools/kernel-scriptlets/rpm-$i +done install -d -m 755 "%{buildroot}%{_prefix}/bin" install -pm 755 kmp-install "%{buildroot}%{_bindir}/"