pool/suse-module-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- Update to version 15.2.9:
  * 00-system.conf: move br_netfilter softdep to separate file
    (boo#1158817)

OBS-URL: https://build.opensuse.org/request/show/764808
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=79
This commit is contained in:
Martin Wilck 2020-01-15 21:13:20 +00:00 committed by Git OBS Bridge
parent 5596c58936
commit 8d014a0180
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
suse-module-tools-15.2.8.tar.xz
View File

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

3
suse-module-tools-15.2.9.tar.xz Normal file
View File

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

7
suse-module-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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 Thu Jan 09 12:30:58 UTC 2020 - mwilck@suse.com

14
suse-module-tools.spec
View File

@ -28,8 +28,12 @@
%global fs_blacklist cramfs ufs %global fs_blacklist cramfs ufs
%endif %endif
%if 0%{?sle_version} >= 120200 && 0%{?is_opensuse} == 0
%global softdep_br_netfilter 1
%endif
Name: suse-module-tools Name: suse-module-tools
Version: 15.2.8 Version: 15.2.9
Release: 0 Release: 0
Summary: Configuration for module loading and SUSE-specific utilities for KMPs Summary: Configuration for module loading and SUSE-specific utilities for KMPs
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -92,6 +96,11 @@ install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d"
install -pm644 "10-unsupported-modules.conf" \ install -pm644 "10-unsupported-modules.conf" \
"%{buildroot}%{_sysconfdir}/modprobe.d/" "%{buildroot}%{_sysconfdir}/modprobe.d/"
install -pm644 00-system.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 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf" install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf"
%endif %endif
@ -245,6 +254,9 @@ done
%doc README.SUSE %doc README.SUSE
%dir %{_sysconfdir}/modprobe.d %dir %{_sysconfdir}/modprobe.d
%config %{_sysconfdir}/modprobe.d/00-system.conf %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 %config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
%config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf %config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf