From eabc9531836a3aca82cf60cc6c5e7444dcf119b8189ed43740bf41dca7c54805 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 29 Nov 2022 16:15:14 +0000 Subject: [PATCH] Accepting request 1038931 from home:mwilck:suse-module-tools - Update to version 16.0.28: * Split kernel scriptlets into separate sub-package, again (boo#1202353, boo#1205149) OBS-URL: https://build.opensuse.org/request/show/1038931 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=151 --- _servicedata | 2 +- suse-module-tools-16.0.27.obscpio | 3 --- suse-module-tools-16.0.28.obscpio | 3 +++ suse-module-tools.changes | 7 +++++++ suse-module-tools.obsinfo | 6 +++--- suse-module-tools.spec | 29 ++++++++++++++++++++++++++--- 6 files changed, 40 insertions(+), 10 deletions(-) delete mode 100644 suse-module-tools-16.0.27.obscpio create mode 100644 suse-module-tools-16.0.28.obscpio diff --git a/_servicedata b/_servicedata index 1d31178..a8cfcea 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 7129a76eb94202c1f9882ff28e1c3edbadfd763d \ No newline at end of file + 86a9766d5e40d9b904972b4da2233f955477fa12 \ No newline at end of file diff --git a/suse-module-tools-16.0.27.obscpio b/suse-module-tools-16.0.27.obscpio deleted file mode 100644 index 52bddea..0000000 --- a/suse-module-tools-16.0.27.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:165d4d9dd1e04d27d66608ea89bc3b2b784a1519e64fefe9f8ca05865397a0ab -size 134667 diff --git a/suse-module-tools-16.0.28.obscpio b/suse-module-tools-16.0.28.obscpio new file mode 100644 index 0000000..9758d5e --- /dev/null +++ b/suse-module-tools-16.0.28.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ae4d003f45b0a67dc0a4baaa0a9c0c2edff2b39a598aa5e940387bd62dcf6d4 +size 135691 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 64eec9a..ee90de6 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 29 16:13:08 UTC 2022 - Martin Wilck + +- Update to version 16.0.28: + * Split kernel scriptlets into separate sub-package, again + (boo#1202353, boo#1205149) + ------------------------------------------------------------------- Mon Nov 21 15:52:55 UTC 2022 - Martin Wilck diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index 68cf272..bb28681 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,4 +1,4 @@ name: suse-module-tools -version: 16.0.27 -mtime: 1669045905 -commit: 7129a76eb94202c1f9882ff28e1c3edbadfd763d +version: 16.0.28 +mtime: 1669738319 +commit: 86a9766d5e40d9b904972b4da2233f955477fa12 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 717bafe..10da838 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.27 +Version: 16.0.28 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -64,7 +64,9 @@ Requires: rpm Requires(post): /usr/bin/grep Requires(post): /usr/bin/sed Requires(post): coreutils +%if 0%{?suse_version} < 1550 Provides: suse-kernel-rpm-scriptlets = 0 +%endif Provides: udev-extra-rules = 0.3.0 Obsoletes: udev-extra-rules < 0.3.0 Provides: system-tuning-common-SUSE = 0.3.0 @@ -99,6 +101,17 @@ This package contains the legacy "weak-modules" script for kernel module package (KMP) support. It was replaced by "weak-modules2" in SLE 11 and later. It is still used by the DKMS module packaging framework. +%if 0%{?suse_version} >= 1550 +%package scriptlets +Summary: Kernel rpm scriptlets +Provides: suse-kernel-rpm-scriptlets = 0 +Requires: suse-module-tools = %{version} +Provides: suse-module-tools:/usr/lib/module-init-tools/kernel-scriptlets + +%description scriptlets +Scripts called by the SUSE kernel packages on installation +%endif + %prep %setup -q @@ -263,8 +276,12 @@ exit 0 %{_rpmmacrodir}/macros.initrd %endif %{_bindir}/kmp-install -/usr/lib/module-init-tools -%exclude /usr/lib/module-init-tools/weak-modules +%dir /usr/lib/module-init-tools +/usr/lib/module-init-tools/driver-check.sh +/usr/lib/module-init-tools/lsinitrd-quick +/usr/lib/module-init-tools/regenerate-initrd-posttrans +/usr/lib/module-init-tools/unblacklist +/usr/lib/module-init-tools/weak-modules2 %{_unitdir}/*.service %{_unitdir}/systemd-sysctl.service.d %{_modulesloaddir} @@ -272,6 +289,12 @@ exit 0 %ifarch ppc64 ppc64le /usr/lib/systemd/system-generators %endif +# +%if 0%{?suse_version} >= 1550 +%files scriptlets +%endif +/usr/lib/module-init-tools/kernel-scriptlets + %files legacy %defattr(-,root,root)