From 597ba7391dd1b97fab6efc4ea6b6bc86338761246dd106de057202a26befb763 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 30 Jan 2019 17:01:31 +0000 Subject: [PATCH] - 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 @@ git enable suse-module-tools - 15.0.10 + 15.0.20 master *.spec *.rpmlintrc diff --git a/_servicedata b/_servicedata index 2a513fe..e5cc233 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 54fd1c7aecde4572e2e4b45af79ac37017775dbe \ No newline at end of file + fbb77353cf42a9b36d49cff50ec00e56f605130c \ 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 + +- 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 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