From e42eda2e1396b0a798ecc29fed204e7fcbc1aa84384e1c346bec1417bd05a330 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Mon, 10 Dec 2018 10:49:41 +0000
Subject: [PATCH 1/9] Accepting request 656043 from
 home:adrianSuSE:branches:Base:System

- Require mkinitrd (provided also by dracut) directly instead of
  file requires. This is fixing image build failures

I keep loosing the fight to get a fileprovides in our base distros
because of some build cycle.

But all appliance builds are failing without having mkinitrd installed,
so trying to avoid the fileprovides.

OBS-URL: https://build.opensuse.org/request/show/656043
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=49
---
 suse-module-tools.changes | 6 ++++++
 suse-module-tools.spec    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index ac6494d..62ff4db 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  7 12:45:36 UTC 2018 - Adrian Schröter <adrian@suse.de>
+
+- 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..5ac3ad9 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -25,12 +25,13 @@ Group:          System/Base
 Url:            https://github.com/openSUSE/suse-module-tools
 Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}.rpmlintrc
-Requires:       /sbin/mkinitrd
+# not /sbin/mkinitrd because base distros don't provide it on purpose
 Requires:       binutils
 Requires:       coreutils
 Requires:       findutils
 Requires:       grep
 Requires:       gzip
+Requires:       mkinitrd
 # module-init-tools in older distros, kmod-compat in later ones
 Requires:       /sbin/depmod
 Requires:       rpm

From 6e770b2d3c6406db05e28a529e40ed8d484df2709717c07480abaa325ef0e6ec Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 11 Dec 2018 08:38:04 +0000
Subject: [PATCH 2/9] 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 ++--
 suse-module-tools-15.0.1.tar.xz |  3 ---
 suse-module-tools-15.0.2.tar.xz |  3 +++
 suse-module-tools.changes       |  6 ++++++
 suse-module-tools.spec          | 23 ++++++++++++++++++++---
 5 files changed, 31 insertions(+), 8 deletions(-)
 delete mode 100644 suse-module-tools-15.0.1.tar.xz
 create mode 100644 suse-module-tools-15.0.2.tar.xz

diff --git a/_service b/_service
index d8c522a..c9517cd 100644
--- a/_service
+++ b/_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>
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.0.2.tar.xz b/suse-module-tools-15.0.2.tar.xz
new file mode 100644
index 0000000..3d02b73
--- /dev/null
+++ b/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
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 62ff4db..dd7daef 100644
--- a/suse-module-tools.changes
+++ b/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>
 
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 5ac3ad9..f878125 100644
--- a/suse-module-tools.spec
+++ b/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

From 5b90dff3e4d91c941a04be053874fae2a5b3c314845029b129efe333399cda0c Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Wed, 12 Dec 2018 07:57:48 +0000
Subject: [PATCH 3/9] Fixed typo in package description

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=51
---
 suse-module-tools.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index f878125..750121b 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -37,7 +37,7 @@ Requires:       rpm
 Requires:       sed
 
 %description
-This package contains helper scripts for MP installation and
+This package contains helper scripts for KMP 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.

From da56c2bf876ee0981b9dff2eaabc9de02b39d0d88e01a25fae6587e43c7151eb Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Wed, 12 Dec 2018 11:45:28 +0000
Subject: [PATCH 4/9] - Update to version 15.0.10:   * moved modsign-verify to
 pesign-obs-integration (bsc#1118953)

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=52
---
 _service                         | 2 +-
 _servicedata                     | 2 +-
 suse-module-tools-15.0.10.tar.xz | 3 +++
 suse-module-tools-15.0.2.tar.xz  | 3 ---
 suse-module-tools.changes        | 6 ++++++
 suse-module-tools.spec           | 5 +----
 6 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 suse-module-tools-15.0.10.tar.xz
 delete mode 100644 suse-module-tools-15.0.2.tar.xz

diff --git a/_service b/_service
index c9517cd..e11f73e 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">suse-module-tools</param>
-    <param name="version">15.0.2</param>
+    <param name="version">15.0.10</param>
     <param name="revision">master</param>
     <param name="exclude">*.spec</param>
     <param name="exclude">*.rpmlintrc</param>
diff --git a/_servicedata b/_servicedata
index 58c3f66..2a513fe 100644
--- a/_servicedata
+++ b/_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">5c6331938afd2e9250b60450d458bd9297f0d2cf</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">54fd1c7aecde4572e2e4b45af79ac37017775dbe</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.0.10.tar.xz b/suse-module-tools-15.0.10.tar.xz
new file mode 100644
index 0000000..9426983
--- /dev/null
+++ b/suse-module-tools-15.0.10.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc12d5fa0478b3a2294b5971b55c9aea6aa69425d5005fc5a535b64a13bdb6f0
+size 24016
diff --git a/suse-module-tools-15.0.2.tar.xz b/suse-module-tools-15.0.2.tar.xz
deleted file mode 100644
index 3d02b73..0000000
--- a/suse-module-tools-15.0.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56b844924ed7f2138c746d0eccef6a2ee6c83de7457ac067dceb5af66e8ab8ab
-size 27984
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index dd7daef..095b62f 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 12 11:42:07 UTC 2018 - mwilck@suse.com
+
+- Update to version 15.0.10:
+  * moved modsign-verify to pesign-obs-integration (bsc#1118953)
+
 -------------------------------------------------------------------
 Mon Dec 10 12:10:29 UTC 2018 - Martin Wilck <mwilck@suse.com>
 
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 750121b..4beccc6 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           suse-module-tools
-Version:        15.0.2
+Version:        15.0.10
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -88,9 +88,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}/"
@@ -191,7 +189,6 @@ fi
 %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

From 597ba7391dd1b97fab6efc4ea6b6bc86338761246dd106de057202a26befb763 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Wed, 30 Jan 2019 17:01:31 +0000
Subject: [PATCH 5/9] - Update to version 15.0.20 (git a2e213d): - Fix
 driver-check.sh (boo#1123697, boo#1123704) - add
 /etc/modprobe.d/50-blacklist.conf from sysconfig package   (boo#1107611) -
 add file system blacklist file (fate#326832) - 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

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=53
---
 _service                         |  2 +-
 _servicedata                     |  2 +-
 suse-module-tools-15.0.10.tar.xz |  3 ---
 suse-module-tools-15.0.20.tar.xz |  3 +++
 suse-module-tools.changes        | 27 ++++++++++++++++++++++++---
 suse-module-tools.spec           | 29 +++++++++++++++++++++++------
 6 files changed, 52 insertions(+), 14 deletions(-)
 delete mode 100644 suse-module-tools-15.0.10.tar.xz
 create mode 100644 suse-module-tools-15.0.20.tar.xz

diff --git a/_service b/_service
index e11f73e..8dcf5e5 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">suse-module-tools</param>
-    <param name="version">15.0.10</param>
+    <param name="version">15.0.20</param>
     <param name="revision">master</param>
     <param name="exclude">*.spec</param>
     <param name="exclude">*.rpmlintrc</param>
diff --git a/_servicedata b/_servicedata
index 2a513fe..e5cc233 100644
--- a/_servicedata
+++ b/_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">54fd1c7aecde4572e2e4b45af79ac37017775dbe</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">fbb77353cf42a9b36d49cff50ec00e56f605130c</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.0.10.tar.xz b/suse-module-tools-15.0.10.tar.xz
deleted file mode 100644
index 9426983..0000000
--- a/suse-module-tools-15.0.10.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc12d5fa0478b3a2294b5971b55c9aea6aa69425d5005fc5a535b64a13bdb6f0
-size 24016
diff --git a/suse-module-tools-15.0.20.tar.xz b/suse-module-tools-15.0.20.tar.xz
new file mode 100644
index 0000000..a4f899f
--- /dev/null
+++ b/suse-module-tools-15.0.20.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61a86488f04db8e0e2abece15b690b87834478455ac525c8a64fbde2f845429a
+size 26252
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 095b62f..70066d2 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,8 +1,29 @@
 -------------------------------------------------------------------
-Wed Dec 12 11:42:07 UTC 2018 - mwilck@suse.com
+Wed Jan 30 17:00:44 UTC 2019 - mwilck@suse.com
 
-- Update to version 15.0.10:
-  * moved modsign-verify to pesign-obs-integration (bsc#1118953)
+- Update to version 15.0.20:
+  * suse-module-tools.spec: remove dependency on kmod-compat
+  * driver-check.sh: fix maintainer and bump version
+  * driver-check.sh: fix "kernel-default... was not installed correctly"
+  * driver-check.sh: remove broken check for update repo
+  * driver-check.sh: fix broken test for module-init-tools
+  * make code work without kmod-compat
+  * Remove hard dependency on mkinitrd
+  * modprobe.conf: add file system blacklist file (fate#326832).
+  * modprobe.conf: add 50-blacklist.conf to %files
+  * add /etc/modprobe.d/50-blacklist.conf (boo#1107611)
+
+-------------------------------------------------------------------
+Wed Jan 30 15:50:21 UTC 2019 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 15.0.20 (git a2e213d):
+- Fix driver-check.sh (boo#1123697, boo#1123704)
+- add /etc/modprobe.d/50-blacklist.conf from sysconfig package
+  (boo#1107611)
+- add file system blacklist file (fate#326832)
+- 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 <mwilck@suse.com>
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 4beccc6..fb42857 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.10
+Version:        15.0.20
 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
-# not /sbin/mkinitrd because base distros don't provide it on purpose
 Requires:       coreutils
 Requires:       findutils
 Requires:       grep
 Requires:       gzip
-Requires:       mkinitrd
-# 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
@@ -73,6 +78,12 @@ 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} >= 1500
+install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf"
+%if !0%{?is_opensuse}
+install -pm644 modprobe.conf/modprobe.conf.fs-blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/60-filesystem-blacklist.conf"
+%endif
+%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" \
@@ -183,6 +194,12 @@ 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} >= 1500
+%config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf
+%if !0%{?is_opensuse}
+%config(noreplace) %{_sysconfdir}/modprobe.d/60-filesystem-blacklist.conf
+%endif
+%endif
 %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf
 %dir %{_sysconfdir}/depmod.d
 %config %{_sysconfdir}/depmod.d/00-system.conf

From 046c77845a220ab3481ccc34ae25f91259caa65ff3f4bf437f51124d368ad8b5 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Wed, 30 Jan 2019 18:16:01 +0000
Subject: [PATCH 6/9] 
 ------------------------------------------------------------------ - Update
 to version 15.0.20 (git 2f55a7ec): fix file conflict in blacklist.conf

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=54
---
 _servicedata                     |  2 +-
 suse-module-tools-15.0.20.tar.xz |  4 ++--
 suse-module-tools.changes        | 19 ++-----------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/_servicedata b/_servicedata
index e5cc233..4eeaf0a 100644
--- a/_servicedata
+++ b/_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">fbb77353cf42a9b36d49cff50ec00e56f605130c</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">2f55a7ecc640a52bc621c89df8a01d54d1a8e6e3</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.0.20.tar.xz b/suse-module-tools-15.0.20.tar.xz
index a4f899f..6df9e7f 100644
--- a/suse-module-tools-15.0.20.tar.xz
+++ b/suse-module-tools-15.0.20.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61a86488f04db8e0e2abece15b690b87834478455ac525c8a64fbde2f845429a
-size 26252
+oid sha256:3cd8f1582e0940ce1e236b0573bd2424f9cd7150de570ab76a57264ff1c885d1
+size 26272
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 70066d2..22a65f5 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,22 +1,7 @@
--------------------------------------------------------------------
-Wed Jan 30 17:00:44 UTC 2019 - mwilck@suse.com
-
-- Update to version 15.0.20:
-  * suse-module-tools.spec: remove dependency on kmod-compat
-  * driver-check.sh: fix maintainer and bump version
-  * driver-check.sh: fix "kernel-default... was not installed correctly"
-  * driver-check.sh: remove broken check for update repo
-  * driver-check.sh: fix broken test for module-init-tools
-  * make code work without kmod-compat
-  * Remove hard dependency on mkinitrd
-  * modprobe.conf: add file system blacklist file (fate#326832).
-  * modprobe.conf: add 50-blacklist.conf to %files
-  * add /etc/modprobe.d/50-blacklist.conf (boo#1107611)
-
--------------------------------------------------------------------
+------------------------------------------------------------------
 Wed Jan 30 15:50:21 UTC 2019 - Martin Wilck <mwilck@suse.com>
 
-- Update to version 15.0.20 (git a2e213d):
+- Update to version 15.0.20 (git 2f55a7ec):
 - Fix driver-check.sh (boo#1123697, boo#1123704)
 - add /etc/modprobe.d/50-blacklist.conf from sysconfig package
   (boo#1107611)

From 9f5df8169346bfb18d212883e3ad2ac03ba87d3b08645c04488b55059860a9c0 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Wed, 30 Jan 2019 23:08:19 +0000
Subject: [PATCH 7/9] - Update to version 15.0.20 (git 1396df5): revert fs
 blacklist change for now. too controversial to push at this time

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=55
---
 _servicedata                     | 2 +-
 suse-module-tools-15.0.20.tar.xz | 4 ++--
 suse-module-tools.changes        | 7 +++----
 suse-module-tools.spec           | 6 ------
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/_servicedata b/_servicedata
index 4eeaf0a..1ba84d5 100644
--- a/_servicedata
+++ b/_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">2f55a7ecc640a52bc621c89df8a01d54d1a8e6e3</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">1396df57d144f145d0e7e71d179e0a1aea6a34c6</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.0.20.tar.xz b/suse-module-tools-15.0.20.tar.xz
index 6df9e7f..25c3a11 100644
--- a/suse-module-tools-15.0.20.tar.xz
+++ b/suse-module-tools-15.0.20.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cd8f1582e0940ce1e236b0573bd2424f9cd7150de570ab76a57264ff1c885d1
-size 26272
+oid sha256:439237025e98507a93fae463866dfdfb7f84c60da2b9f63cd804ad17fda1ee49
+size 25964
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 22a65f5..cb27d33 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,11 +1,10 @@
-------------------------------------------------------------------
-Wed Jan 30 15:50:21 UTC 2019 - Martin Wilck <mwilck@suse.com>
+-------------------------------------------------------------------
+Wed Jan 30 23:04:26 UTC 2019 - mwilck@suse.com
 
-- Update to version 15.0.20 (git 2f55a7ec):
+- 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)
-- add file system blacklist file (fate#326832)
 - 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
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index fb42857..766332a 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -80,9 +80,6 @@ install -pm644 "10-unsupported-modules.conf" \
 install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/"
 %if 0%{?suse_version} >= 1500
 install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf"
-%if !0%{?is_opensuse}
-install -pm644 modprobe.conf/modprobe.conf.fs-blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/60-filesystem-blacklist.conf"
-%endif
 %endif
 install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf"
 install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d"
@@ -196,9 +193,6 @@ fi
 %config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf
 %if 0%{?suse_version} >= 1500
 %config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf
-%if !0%{?is_opensuse}
-%config(noreplace) %{_sysconfdir}/modprobe.d/60-filesystem-blacklist.conf
-%endif
 %endif
 %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf
 %dir %{_sysconfdir}/depmod.d

From e5d9b450ba558cdde42144583c311f0eb9ad7d7c010730c7856f0823e140f7da Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Thu, 31 Jan 2019 22:04:12 +0000
Subject: [PATCH 8/9] - Update to version 15.1.0 (git d263ea6):   *
 50-blacklist.conf is not added in Leap before 15.1.   fix conditionals and
 bump version accordingly.

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=56
---
 _service                         | 2 +-
 _servicedata                     | 2 +-
 suse-module-tools-15.0.20.tar.xz | 3 ---
 suse-module-tools-15.1.0.tar.xz  | 3 +++
 suse-module-tools.changes        | 7 +++++++
 suse-module-tools.spec           | 6 +++---
 6 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 suse-module-tools-15.0.20.tar.xz
 create mode 100644 suse-module-tools-15.1.0.tar.xz

diff --git a/_service b/_service
index 8dcf5e5..a946cd2 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">suse-module-tools</param>
-    <param name="version">15.0.20</param>
+    <param name="version">15.1.0</param>
     <param name="revision">master</param>
     <param name="exclude">*.spec</param>
     <param name="exclude">*.rpmlintrc</param>
diff --git a/_servicedata b/_servicedata
index 1ba84d5..14373f9 100644
--- a/_servicedata
+++ b/_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">1396df57d144f145d0e7e71d179e0a1aea6a34c6</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">d263ea6fb851327a740a2612ac8fcae7751e9fee</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.0.20.tar.xz b/suse-module-tools-15.0.20.tar.xz
deleted file mode 100644
index 25c3a11..0000000
--- a/suse-module-tools-15.0.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:439237025e98507a93fae463866dfdfb7f84c60da2b9f63cd804ad17fda1ee49
-size 25964
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..b63405c
--- /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:a39b5c4354391a16e4bd919a3f635e3895d0d4bee5289be0f0b58a135c37df70
+size 25972
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index cb27d33..6e11b7b 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 31 21:50:45 UTC 2019 - mwilck@suse.com
+
+- Update to version 15.1.0 (git d263ea6):
+  * 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
 
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 766332a..6f97ea8 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           suse-module-tools
-Version:        15.0.20
+Version:        15.1.0
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -78,7 +78,7 @@ 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} >= 1500
+%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"
@@ -191,7 +191,7 @@ 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} >= 1500
+%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

From 62dcf5b79d59f28d7e7fe97c1b738f97152b4def52e23dde5f6710ee373e85b3 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Thu, 31 Jan 2019 23:08:28 +0000
Subject: [PATCH 9/9] - Update to version 15.1.0 (git 6b07b88):

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=57
---
 _servicedata                    | 2 +-
 suse-module-tools-15.1.0.tar.xz | 4 ++--
 suse-module-tools.changes       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_servicedata b/_servicedata
index 14373f9..a81ab34 100644
--- a/_servicedata
+++ b/_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">d263ea6fb851327a740a2612ac8fcae7751e9fee</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">6b07b8840b0e26b7f4fcaf5c5ddf17f6a3b97810</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.1.0.tar.xz b/suse-module-tools-15.1.0.tar.xz
index b63405c..b55aab4 100644
--- a/suse-module-tools-15.1.0.tar.xz
+++ b/suse-module-tools-15.1.0.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a39b5c4354391a16e4bd919a3f635e3895d0d4bee5289be0f0b58a135c37df70
-size 25972
+oid sha256:87bc4b41e92a4219d4042d9003a86ae46fe87f77dddb0735e1cab0a5080b579b
+size 25976
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 6e11b7b..1a3ffff 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
-Thu Jan 31 21:50:45 UTC 2019 - mwilck@suse.com
+Thu Jan 31 23:07:10 UTC 2019 - mwilck@suse.com
 
-- Update to version 15.1.0 (git d263ea6):
+- 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.