diff --git a/_service b/_service
index d8c522a..a946cd2 100644
--- a/_service
+++ b/_service
@@ -4,8 +4,8 @@
git
enable
suse-module-tools
- 15.0.1
- 15.0.1
+ 15.1.0
+ master
*.spec
*.rpmlintrc
diff --git a/_servicedata b/_servicedata
index 58c3f66..a81ab34 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/openSUSE/suse-module-tools.git
- 5c6331938afd2e9250b60450d458bd9297f0d2cf
\ No newline at end of file
+ 6b07b8840b0e26b7f4fcaf5c5ddf17f6a3b97810
\ No newline at end of file
diff --git a/suse-module-tools-15.0.1.tar.xz b/suse-module-tools-15.0.1.tar.xz
deleted file mode 100644
index 38cc081..0000000
--- a/suse-module-tools-15.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f090075efe7f9f414eec855dde3c2355ca6621db036adecbee5694adacb6531
-size 27980
diff --git a/suse-module-tools-15.1.0.tar.xz b/suse-module-tools-15.1.0.tar.xz
new file mode 100644
index 0000000..b55aab4
--- /dev/null
+++ b/suse-module-tools-15.1.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87bc4b41e92a4219d4042d9003a86ae46fe87f77dddb0735e1cab0a5080b579b
+size 25976
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index ac6494d..1a3ffff 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Jan 31 23:07:10 UTC 2019 - mwilck@suse.com
+
+- Update to version 15.1.0 (git 6b07b88):
+ * 50-blacklist.conf is not added in Leap before 15.1.
+ fix conditionals and bump version accordingly.
+
+-------------------------------------------------------------------
+Wed Jan 30 23:04:26 UTC 2019 - mwilck@suse.com
+
+- Update to version 15.0.20 (git 1396df5):
+- Fix driver-check.sh (boo#1123697, boo#1123704)
+- add /etc/modprobe.d/50-blacklist.conf from sysconfig package
+ (boo#1107611)
+- Remove hard dependency on mkinitrd (boo#1123721)
+- Make sure code works also without kmod-compat
+- Replace file dependency on /sbin/depmod by weak package dependency
+
+-------------------------------------------------------------------
+Mon Dec 10 12:10:29 UTC 2018 - Martin Wilck
+
+- 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
+
+- Require mkinitrd (provided also by dracut) directly instead of
+ file requires. This is fixing image build failures
+
-------------------------------------------------------------------
Wed Nov 07 14:53:52 UTC 2018 - mwilck@suse.com
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index ce43386..6f97ea8 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -1,7 +1,7 @@
#
# spec file for package suse-module-tools
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: suse-module-tools
-Version: 15.0.1
+Version: 15.1.0
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities for KMPs
License: GPL-2.0-or-later
@@ -25,16 +25,21 @@ Group: System/Base
Url: https://github.com/openSUSE/suse-module-tools
Source0: %{name}-%{version}.tar.xz
Source1: %{name}.rpmlintrc
-Requires: /sbin/mkinitrd
-Requires: binutils
Requires: coreutils
Requires: findutils
Requires: grep
Requires: gzip
-# module-init-tools in older distros, kmod-compat in later ones
-Requires: /sbin/depmod
Requires: rpm
Requires: sed
+# Use weak dependencies for mkinitrd 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: kmod
+%else
+Recommends: modutils
+%endif
%description
This package contains helper scripts for KMP installation and
@@ -42,6 +47,18 @@ 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
@@ -61,6 +78,9 @@ install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d"
install -pm644 "10-unsupported-modules.conf" \
"%{buildroot}%{_sysconfdir}/modprobe.d/"
install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/"
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
+install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf"
+%endif
install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf"
install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d"
install -pm 644 "depmod-00-system.conf" \
@@ -76,9 +96,7 @@ install -d -m 755 "%{buildroot}%{_sysconfdir}/rpm"
install -pm 644 "macros.initrd" "%{buildroot}%{_sysconfdir}/rpm/"
install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}%{_libexecdir}/module-init-tools/"
-# modsign-verify for verifying module signatures
install -d -m 755 "%{buildroot}%{_prefix}/bin"
-install -pm 755 modsign-verify "%{buildroot}%{_bindir}/"
install -pm 755 kmp-install "%{buildroot}%{_bindir}/"
# modhash for calculating hash of signed kernel module
install -pm 755 modhash "%{buildroot}%{_bindir}/"
@@ -173,16 +191,24 @@ fi
%dir %{_sysconfdir}/modprobe.d
%config %{_sysconfdir}/modprobe.d/00-system.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
+%config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf
+%endif
%config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf
%dir %{_sysconfdir}/depmod.d
%config %{_sysconfdir}/depmod.d/00-system.conf
%config %{_sysconfdir}/rpm/macros.initrd
%{_bindir}/modhash
%{_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