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

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

suse-module-tools-15.4.1.obscpio

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

suse-module-tools-16.0.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28a7c7cd5988fcc483490157f97a93e92b164ac38b990a45caf3408dfd1ad52c
+size 83467

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
 

suse-module-tools.obsinfo

@@ -1,5 +1,5 @@
 name: suse-module-tools
-version: 15.4.1
+version: 16.0
-mtime: 1619108342
+mtime: 1621958388
-commit: f4a9c82b6e4964fed422119264ac944330b68d85
+commit: 8276520caee4bda32a2fc43b32bf1e584168fb25
 

suse-module-tools.rpmlintrc

@@ -1,2 +1,3 @@
 # The package installs different configs for different architectures
 addFilter("no-binary");
+

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
+Recommends:     dracut
-%if 0%{?suse_version} >= 1315
 Recommends:     kmod
-%else
+# This release requires the dracut module 90nvdimm
-Recommends:     modutils
+Conflicts:      dracut < 49.1
-%endif
-# This release requires the dracut fix for bsc#1127891
-Conflicts:      dracut < 44.2
 
 %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