From 7f3e132cb1cec87dbb3082c06290c1c235afad32505643d983c7d7494badcdb8 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 27 May 2021 11:10:39 +0000 Subject: [PATCH 1/7] Accepting request 895749 from home:mwilck:branches:Base:System - Update to version 16.0 - modprobe.conf cleanup (bsc#1161343) * Unify ppc64 and ppc64le * Delete files for obsolete architectures * Remove obsolete SUSE_INITRD statements (bsc#1161343) * Add dependency on dracut 049.1 (bsc#1142152, ltc#176292, FATE#327775) - Replace mkinitrd with dracut everywhere - Remove obsolete "weak-modules" script OBS-URL: https://build.opensuse.org/request/show/895749 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=109 --- _servicedata | 2 +- suse-module-tools-15.4.1.obscpio | 3 --- suse-module-tools-16.0.obscpio | 3 +++ suse-module-tools.changes | 12 +++++++++++ suse-module-tools.obsinfo | 6 +++--- suse-module-tools.rpmlintrc | 1 + suse-module-tools.spec | 34 +++++++------------------------- 7 files changed, 27 insertions(+), 34 deletions(-) delete mode 100644 suse-module-tools-15.4.1.obscpio create mode 100644 suse-module-tools-16.0.obscpio diff --git a/_servicedata b/_servicedata index 43ad63e..a1dca58 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - f4a9c82b6e4964fed422119264ac944330b68d85 \ No newline at end of file + 8276520caee4bda32a2fc43b32bf1e584168fb25 \ No newline at end of file diff --git a/suse-module-tools-15.4.1.obscpio b/suse-module-tools-15.4.1.obscpio deleted file mode 100644 index d76e766..0000000 --- a/suse-module-tools-15.4.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e048038228685ca609cc8c1f9efb57fdecef0edb84819fb7ecfba45c33063536 -size 99339 diff --git a/suse-module-tools-16.0.obscpio b/suse-module-tools-16.0.obscpio new file mode 100644 index 0000000..4d4af44 --- /dev/null +++ b/suse-module-tools-16.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a7c7cd5988fcc483490157f97a93e92b164ac38b990a45caf3408dfd1ad52c +size 83467 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index ffb98e2..ce97954 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu May 27 09:29:56 UTC 2021 - mwilck@suse.com + +- Update to version 16.0 +- modprobe.conf cleanup (bsc#1161343) + * Unify ppc64 and ppc64le + * Delete files for obsolete architectures + * Remove obsolete SUSE_INITRD statements (bsc#1161343) + * Add dependency on dracut 049.1 (bsc#1142152, ltc#176292, FATE#327775) +- Replace mkinitrd with dracut everywhere +- Remove obsolete "weak-modules" script + ------------------------------------------------------------------- Thu Apr 22 16:29:01 UTC 2021 - obs-service-tar-scm@invalid diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index e4b574c..08e1873 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,5 @@ name: suse-module-tools -version: 15.4.1 -mtime: 1619108342 -commit: f4a9c82b6e4964fed422119264ac944330b68d85 +version: 16.0 +mtime: 1621958388 +commit: 8276520caee4bda32a2fc43b32bf1e584168fb25 diff --git a/suse-module-tools.rpmlintrc b/suse-module-tools.rpmlintrc index 0ae3316..97b2b09 100644 --- a/suse-module-tools.rpmlintrc +++ b/suse-module-tools.rpmlintrc @@ -1,2 +1,3 @@ # The package installs different configs for different architectures addFilter("no-binary"); + diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 14e3b69..18d31f3 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version: 15.4.1 +Version: 16.0 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -45,17 +45,13 @@ Requires: rpm Requires(post): /usr/bin/grep Requires(post): /usr/bin/sed Requires(post): coreutils -# Use weak dependencies for mkinitrd and kmod in order to +# Use weak dependencies for dracut and kmod in order to # keep Ring0 lean. In normal deployments, these packages # will be available anyway. -Recommends: mkinitrd -%if 0%{?suse_version} >= 1315 +Recommends: dracut Recommends: kmod -%else -Recommends: modutils -%endif -# This release requires the dracut fix for bsc#1127891 -Conflicts: dracut < 44.2 +# This release requires the dracut module 90nvdimm +Conflicts: dracut < 49.1 %description This package contains helper scripts for KMP installation and @@ -63,17 +59,6 @@ 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. -%package legacy -Summary: Legacy "weak-modules" script for Code10 -Group: System/Base -Requires: %{name} -Requires: binutils - -%description legacy -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. - %prep %setup -q @@ -104,7 +89,7 @@ install -pm 644 "depmod-00-system.conf" \ # "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc. install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" -install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/" +install -pm 755 weak-modules2 "%{buildroot}/usr/lib/module-init-tools/" install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/" %if 0%{?suse_version} < 1550 @@ -127,7 +112,7 @@ install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.s # Not needed in SLE11, where sg is loaded via udev rule. install -d -m 755 "%{buildroot}%{modules_load_dir}" install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}" -%ifarch ppc64le +%ifarch ppc64 ppc64le install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators %endif @@ -267,7 +252,6 @@ done %endif %{_bindir}/kmp-install /usr/lib/module-init-tools -%exclude /usr/lib/module-init-tools/weak-modules %{_unitdir}/systemd-sysctl.service.d %dir %{modules_load_dir} %{modules_load_dir}/sg.conf @@ -275,8 +259,4 @@ done /usr/lib/systemd/system-generators %endif -%files legacy -%defattr(-,root,root) -/usr/lib/module-init-tools/weak-modules - %changelog From d79a55cc4ed8da606847d7952f67f9cdd858fe09238fdfa6711c8c70b0f8486d Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 27 May 2021 18:50:43 +0000 Subject: [PATCH 2/7] Accepting request 895830 from home:mwilck:suse-module-tools - Update to version 16.1: * fix ppc64/ppc64le build OBS-URL: https://build.opensuse.org/request/show/895830 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=110 --- _service | 1 + _servicedata | 2 +- suse-module-tools-16.0.obscpio | 3 --- suse-module-tools-16.1.obscpio | 3 +++ suse-module-tools.changes | 6 ++++++ suse-module-tools.obsinfo | 6 +++--- suse-module-tools.spec | 3 ++- 7 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 suse-module-tools-16.0.obscpio create mode 100644 suse-module-tools-16.1.obscpio diff --git a/_service b/_service index 812e8c0..494ba0d 100644 --- a/_service +++ b/_service @@ -14,6 +14,7 @@ */suse-module-tools.spec suse-module-tools.spec + *.tar diff --git a/_servicedata b/_servicedata index a1dca58..7dd2acf 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 8276520caee4bda32a2fc43b32bf1e584168fb25 \ No newline at end of file + f6b552ca067d344e70e9338315d46d8be3e709db \ No newline at end of file diff --git a/suse-module-tools-16.0.obscpio b/suse-module-tools-16.0.obscpio deleted file mode 100644 index 4d4af44..0000000 --- a/suse-module-tools-16.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28a7c7cd5988fcc483490157f97a93e92b164ac38b990a45caf3408dfd1ad52c -size 83467 diff --git a/suse-module-tools-16.1.obscpio b/suse-module-tools-16.1.obscpio new file mode 100644 index 0000000..63c8723 --- /dev/null +++ b/suse-module-tools-16.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a181dba0c4e3018ebdf337c8709516fd8b981ff7ada328bd362c0d14c987c27 +size 83467 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index ce97954..e87065d 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 27 18:42:17 UTC 2021 - obs-service-tar-scm@invalid + +- Update to version 16.1: + * fix ppc64/ppc64le build + ------------------------------------------------------------------- Thu May 27 09:29:56 UTC 2021 - mwilck@suse.com diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index 08e1873..9895118 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.0 -mtime: 1621958388 -commit: 8276520caee4bda32a2fc43b32bf1e584168fb25 +version: 16.1 +mtime: 1622140916 +commit: f6b552ca067d344e70e9338315d46d8be3e709db diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 18d31f3..c1dddd0 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version: 16.0 +Version: 16.1 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -59,6 +59,7 @@ 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. + %prep %setup -q From c0085ec013e9dafed647e580e6ced90b55aa8faed2c88ba29874bb3d00dc6d63 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 27 May 2021 20:26:07 +0000 Subject: [PATCH 3/7] Accepting request 895840 from home:mwilck:suse-module-tools Made a mistake in the versioning scheme. - Update to version 16.0.1: OBS-URL: https://build.opensuse.org/request/show/895840 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=111 --- _servicedata | 2 +- suse-module-tools-16.0.1.obscpio | 3 +++ suse-module-tools-16.1.obscpio | 3 --- suse-module-tools.changes | 4 ++-- suse-module-tools.obsinfo | 6 +++--- suse-module-tools.spec | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 suse-module-tools-16.0.1.obscpio delete mode 100644 suse-module-tools-16.1.obscpio diff --git a/_servicedata b/_servicedata index 7dd2acf..5f84d29 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - f6b552ca067d344e70e9338315d46d8be3e709db \ No newline at end of file + 493efa301c0de62ec7b270ff43067b5c4ce8eb68 \ No newline at end of file diff --git a/suse-module-tools-16.0.1.obscpio b/suse-module-tools-16.0.1.obscpio new file mode 100644 index 0000000..8f15fcc --- /dev/null +++ b/suse-module-tools-16.0.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e326ad882299c75ca931d34173a35290c3518711a402c39d5e7d771d31d10ec6 +size 83467 diff --git a/suse-module-tools-16.1.obscpio b/suse-module-tools-16.1.obscpio deleted file mode 100644 index 63c8723..0000000 --- a/suse-module-tools-16.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a181dba0c4e3018ebdf337c8709516fd8b981ff7ada328bd362c0d14c987c27 -size 83467 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index e87065d..1f391f2 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu May 27 18:42:17 UTC 2021 - obs-service-tar-scm@invalid +Thu May 27 19:13:05 UTC 2021 - mwilck@suse.com -- Update to version 16.1: +- Update to version 16.0.1: * fix ppc64/ppc64le build ------------------------------------------------------------------- diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index 9895118..e52545e 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.1 -mtime: 1622140916 -commit: f6b552ca067d344e70e9338315d46d8be3e709db +version: 16.0.1 +mtime: 1622142762 +commit: 493efa301c0de62ec7b270ff43067b5c4ce8eb68 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index c1dddd0..0e66f31 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version: 16.1 +Version: 16.0.1 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later From d920622aa306fd814601d27335adafb18aa64541067f8ea4d179063ccc825353 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 10 Jun 2021 08:48:04 +0000 Subject: [PATCH 4/7] - Update to version 16.0.2: * fix kernel version in dracut invocation (bug in 16.0.0) * spec file: really fix ppc64/ppc64le - Update to version 16.0.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=112 --- _servicedata | 2 +- suse-module-tools-16.0.1.obscpio | 3 --- suse-module-tools.changes | 9 ++++++++- suse-module-tools.obsinfo | 6 +++--- suse-module-tools.spec | 8 +++++--- 5 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 suse-module-tools-16.0.1.obscpio diff --git a/_servicedata b/_servicedata index 5f84d29..bfa94be 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 493efa301c0de62ec7b270ff43067b5c4ce8eb68 \ No newline at end of file + 9ec08dfa2fd7ea240f063196831f114475a6ad66 \ No newline at end of file diff --git a/suse-module-tools-16.0.1.obscpio b/suse-module-tools-16.0.1.obscpio deleted file mode 100644 index 8f15fcc..0000000 --- a/suse-module-tools-16.0.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e326ad882299c75ca931d34173a35290c3518711a402c39d5e7d771d31d10ec6 -size 83467 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 1f391f2..94d817b 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 10 08:41:47 UTC 2021 - mwilck@suse.com + +- Update to version 16.0.2: + * fix kernel version in dracut invocation (bug in 16.0.0) + * spec file: really fix ppc64/ppc64le + ------------------------------------------------------------------- Thu May 27 19:13:05 UTC 2021 - mwilck@suse.com @@ -7,7 +14,7 @@ Thu May 27 19:13:05 UTC 2021 - mwilck@suse.com ------------------------------------------------------------------- Thu May 27 09:29:56 UTC 2021 - mwilck@suse.com -- Update to version 16.0 +- Update to version 16.0.0 - modprobe.conf cleanup (bsc#1161343) * Unify ppc64 and ppc64le * Delete files for obsolete architectures diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index e52545e..3f0b7f0 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.0.1 -mtime: 1622142762 -commit: 493efa301c0de62ec7b270ff43067b5c4ce8eb68 +version: 16.0.2 +mtime: 1623313770 +commit: 9ec08dfa2fd7ea240f063196831f114475a6ad66 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 0e66f31..ee0a1b6 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version: 16.0.1 +Version: 16.0.2 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -59,7 +59,6 @@ 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. - %prep %setup -q @@ -68,6 +67,9 @@ module-init-tools, whichever implementation you choose to install. %install # now assemble the parts for modprobe.conf cp modprobe.conf/modprobe.conf.common 00-system.conf +%ifarch ppc64le +ln -f modprobe.conf/modprobe.conf.ppc64 modprobe.conf/modprobe.conf.$RPM_ARCH +%endif if [ -f "modprobe.conf/modprobe.conf.$RPM_ARCH" ]; then cat "modprobe.conf/modprobe.conf.$RPM_ARCH" >>00-system.conf fi @@ -256,7 +258,7 @@ done %{_unitdir}/systemd-sysctl.service.d %dir %{modules_load_dir} %{modules_load_dir}/sg.conf -%ifarch ppc64le +%ifarch ppc64 ppc64le /usr/lib/systemd/system-generators %endif From a1226503fb8d937757c259e69b0ae109f48357ec5135fed2a19c3aefb4fd039a Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 10 Jun 2021 08:56:20 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=113 --- suse-module-tools-16.0.2.obscpio | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 suse-module-tools-16.0.2.obscpio diff --git a/suse-module-tools-16.0.2.obscpio b/suse-module-tools-16.0.2.obscpio new file mode 100644 index 0000000..dc10a21 --- /dev/null +++ b/suse-module-tools-16.0.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b0714f9e38bbc90e79015c01852f76d995cb210eea0cb5e93bd95d3adcfae37 +size 83467 From 8ec094403854b85b99715373eb5f6e5fdba2ce52ddeb6791425df8b18716eeca Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 17 Jun 2021 14:20:57 +0000 Subject: [PATCH 6/7] Accepting request 900597 from home:mwilck:suse-module-tools - Update to version 16.0.3: * Fix treatment of compressed modules (bsc#1187093) OBS-URL: https://build.opensuse.org/request/show/900597 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=114 --- _service | 1 + _servicedata | 2 +- suse-module-tools-16.0.2.obscpio | 3 --- suse-module-tools-16.0.3.obscpio | 3 +++ suse-module-tools.changes | 6 ++++++ suse-module-tools.obsinfo | 6 +++--- suse-module-tools.spec | 3 ++- 7 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 suse-module-tools-16.0.2.obscpio create mode 100644 suse-module-tools-16.0.3.obscpio diff --git a/_service b/_service index 494ba0d..b7c9485 100644 --- a/_service +++ b/_service @@ -1,3 +1,4 @@ + https://github.com/openSUSE/suse-module-tools.git diff --git a/_servicedata b/_servicedata index bfa94be..e7792ed 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 9ec08dfa2fd7ea240f063196831f114475a6ad66 \ No newline at end of file + 23c00579a78af3f1c28014b1f70c8114fc98033f \ No newline at end of file diff --git a/suse-module-tools-16.0.2.obscpio b/suse-module-tools-16.0.2.obscpio deleted file mode 100644 index dc10a21..0000000 --- a/suse-module-tools-16.0.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b0714f9e38bbc90e79015c01852f76d995cb210eea0cb5e93bd95d3adcfae37 -size 83467 diff --git a/suse-module-tools-16.0.3.obscpio b/suse-module-tools-16.0.3.obscpio new file mode 100644 index 0000000..9088cfe --- /dev/null +++ b/suse-module-tools-16.0.3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:faf1ceabd7a29709e6ab34e145d02434e3a956e35f502c4d7c911374e500de5f +size 83979 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 94d817b..c18f59b 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 17 13:10:42 UTC 2021 - mwilck@suse.com + +- Update to version 16.0.3: + * Fix treatment of compressed modules (bsc#1187093) + ------------------------------------------------------------------- Thu Jun 10 08:41:47 UTC 2021 - mwilck@suse.com diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index 3f0b7f0..e9784a1 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.0.2 -mtime: 1623313770 -commit: 9ec08dfa2fd7ea240f063196831f114475a6ad66 +version: 16.0.3 +mtime: 1623935346 +commit: 23c00579a78af3f1c28014b1f70c8114fc98033f diff --git a/suse-module-tools.spec b/suse-module-tools.spec index ee0a1b6..e1d34e6 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version: 16.0.2 +Version: 16.0.3 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -59,6 +59,7 @@ 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. + %prep %setup -q From eb3d0eeb45cb5187c601659b146ccca33b3ae8b774d5f9fd19ebf29361194f3e Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 17 Jun 2021 15:36:00 +0000 Subject: [PATCH 7/7] Accepting request 900613 from home:mwilck:suse-module-tools - Update to version 16.0.4: * re-add legacy subpackage with "weak-modules", and add a "Supplements" dependency on dkms, which needs it OBS-URL: https://build.opensuse.org/request/show/900613 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=115 --- _servicedata | 2 +- suse-module-tools-16.0.3.obscpio | 3 --- suse-module-tools-16.0.4.obscpio | 3 +++ suse-module-tools.changes | 7 +++++++ suse-module-tools.obsinfo | 6 +++--- suse-module-tools.spec | 21 +++++++++++++++++++-- 6 files changed, 33 insertions(+), 9 deletions(-) delete mode 100644 suse-module-tools-16.0.3.obscpio create mode 100644 suse-module-tools-16.0.4.obscpio diff --git a/_servicedata b/_servicedata index e7792ed..2199e98 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 23c00579a78af3f1c28014b1f70c8114fc98033f \ No newline at end of file + fe422e7058c691493567eeffc162f278b2120549 \ No newline at end of file diff --git a/suse-module-tools-16.0.3.obscpio b/suse-module-tools-16.0.3.obscpio deleted file mode 100644 index 9088cfe..0000000 --- a/suse-module-tools-16.0.3.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:faf1ceabd7a29709e6ab34e145d02434e3a956e35f502c4d7c911374e500de5f -size 83979 diff --git a/suse-module-tools-16.0.4.obscpio b/suse-module-tools-16.0.4.obscpio new file mode 100644 index 0000000..dd18c7f --- /dev/null +++ b/suse-module-tools-16.0.4.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4186329fde129bd7de4ad88612e7eb4c62a8f8b18486f6058b46448b59222dc +size 93707 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index c18f59b..4fbd30c 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 17 14:43:13 UTC 2021 - mwilck@suse.com + +- Update to version 16.0.4: + * re-add legacy subpackage with "weak-modules", and add a + "Supplements" dependency on dkms, which needs it + ------------------------------------------------------------------- Thu Jun 17 13:10:42 UTC 2021 - mwilck@suse.com diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index e9784a1..d0ebe48 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.0.3 -mtime: 1623935346 -commit: 23c00579a78af3f1c28014b1f70c8114fc98033f +version: 16.0.4 +mtime: 1623940916 +commit: fe422e7058c691493567eeffc162f278b2120549 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index e1d34e6..906b281 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version: 16.0.3 +Version: 16.0.4 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -60,6 +60,18 @@ modprobe. These utilities are provided by kmod-compat or module-init-tools, whichever implementation you choose to install. +%package legacy +Summary: Legacy "weak-modules" script for Code10 +Group: System/Base +Requires: %{name} +Requires: binutils +Supplements: dkms + +%description legacy +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. + %prep %setup -q @@ -93,7 +105,7 @@ install -pm 644 "depmod-00-system.conf" \ # "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc. install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" -install -pm 755 weak-modules2 "%{buildroot}/usr/lib/module-init-tools/" +install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/" install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/" %if 0%{?suse_version} < 1550 @@ -256,6 +268,7 @@ done %endif %{_bindir}/kmp-install /usr/lib/module-init-tools +%exclude /usr/lib/module-init-tools/weak-modules %{_unitdir}/systemd-sysctl.service.d %dir %{modules_load_dir} %{modules_load_dir}/sg.conf @@ -263,4 +276,8 @@ done /usr/lib/systemd/system-generators %endif +%files legacy +%defattr(-,root,root) +/usr/lib/module-init-tools/weak-modules + %changelog