Accepting request 656821 from home:mwilck:branches:Base:System

- Move "weak-modules" script to -legacy subpackage to avoid
  dependency on binutils (bsc#1116665)

OBS-URL: https://build.opensuse.org/request/show/656821
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=50

_service

@@ -4,8 +4,8 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">suse-module-tools</param>
-    <param name="version">15.0.1</param>
-    <param name="revision">15.0.1</param>
+    <param name="version">15.0.2</param>
+    <param name="revision">master</param>
     <param name="exclude">*.spec</param>
     <param name="exclude">*.rpmlintrc</param>
   </service>

suse-module-tools-15.0.1.tar.xz

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

suse-module-tools-15.0.2.tar.xz

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

suse-module-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 10 12:10:29 UTC 2018 - Martin Wilck <mwilck@suse.com>
+
+- Move "weak-modules" script to -legacy subpackage to avoid
+  dependency on binutils (bsc#1116665)
+
 -------------------------------------------------------------------
 Fri Dec  7 12:45:36 UTC 2018 - Adrian Schröter <adrian@suse.de>
 

suse-module-tools.spec

@@ -17,7 +17,7 @@
 
 
 Name:           suse-module-tools
-Version:        15.0.1
+Version:        15.0.2
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -26,7 +26,6 @@ Url:            https://github.com/openSUSE/suse-module-tools
 Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}.rpmlintrc
 # not /sbin/mkinitrd because base distros don't provide it on purpose
-Requires:       binutils
 Requires:       coreutils
 Requires:       findutils
 Requires:       grep
@@ -38,11 +37,23 @@ Requires:       rpm
 Requires:       sed
 
 %description
-This package contains helper scripts for KMP installation and
+This package contains helper scripts for MP 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.
 
+
+%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
 
@@ -182,8 +193,14 @@ fi
 %{_bindir}/kmp-install
 %{_bindir}/modsign-verify
 %{_libexecdir}/module-init-tools
+%exclude %{_libexecdir}/module-init-tools/weak-modules
 %{_libexecdir}/systemd/system/systemd-sysctl.service.d
 %dir %{_sysconfdir}/modules-load.d
 %config(noreplace) %{_sysconfdir}/modules-load.d/sg.conf
 
+%files legacy
+%defattr(-,root,root)
+
+%{_libexecdir}/module-init-tools/weak-modules
+
 %changelog