diff --git a/suse-module-tools-15.2.8.tar.xz b/suse-module-tools-15.2.8.tar.xz deleted file mode 100644 index df4917a..0000000 --- a/suse-module-tools-15.2.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a26b3b882fdfaa96986a461d650e20d35e59ab6acd1e5dfe06bf30bc1e79968 -size 25260 diff --git a/suse-module-tools-15.2.9.tar.xz b/suse-module-tools-15.2.9.tar.xz new file mode 100644 index 0000000..6ad979b --- /dev/null +++ b/suse-module-tools-15.2.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:614c30af0f7002af2f026c63f0e597a7caf52bab842665d26db21a17aff672cf +size 25300 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index e7502a9..dc3de86 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -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 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 195b795..d2e35f9 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -28,8 +28,12 @@ %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.8 +Version: 15.2.9 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -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