1
0
Dominique Leuenberger 2020-01-18 11:14:42 +00:00 committed by Git OBS Bridge
commit 4cede9c45b
5 changed files with 32 additions and 7 deletions

View File

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

View File

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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jan 15 20:46:40 UTC 2020 - mwilck@suse.com
- Update to version 15.2.9:
* 00-system.conf: move br_netfilter softdep to separate file
(boo#1158817)
-------------------------------------------------------------------
Thu Jan 09 12:30:58 UTC 2020 - mwilck@suse.com
- Update to version 15.2.8:
* Add modprobe.conf.s390x (bsc#1132798)
-------------------------------------------------------------------
Thu Nov 07 20:34:15 UTC 2019 - mwilck@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package suse-module-tools
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,13 +28,17 @@
%global fs_blacklist cramfs ufs
%endif
%if 0%{?sle_version} >= 120200 && 0%{?is_opensuse} == 0
%global softdep_br_netfilter 1
%endif
Name: suse-module-tools
Version: 15.2.7
Version: 15.2.9
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities for KMPs
License: GPL-2.0-or-later
Group: System/Base
Url: https://github.com/openSUSE/suse-module-tools
URL: https://github.com/openSUSE/suse-module-tools
Source0: %{name}-%{version}.tar.xz
Source1: %{name}.rpmlintrc
Requires: coreutils
@ -92,6 +96,11 @@ 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%{?softdep_br_netfilter}
# softdep bridge->br_netfilter, SLE only
install -pm644 modprobe.conf/00-system-937216.conf %{buildroot}%{_sysconfdir}/modprobe.d
%endif
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf"
%endif
@ -245,6 +254,9 @@ done
%doc README.SUSE
%dir %{_sysconfdir}/modprobe.d
%config %{_sysconfdir}/modprobe.d/00-system.conf
%if 0%{?softdep_br_netfilter}
%config(noreplace) %{_sysconfdir}/modprobe.d/00-system-937216.conf
%endif
%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