From 98c35999a4fae2025fd2cf1482f28d3d191a6c030162b193b828bca00cdde46d Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Fri, 14 Jun 2019 16:06:06 +0000 Subject: [PATCH 1/3] Accepting request 710013 from home:mwilck:branches:Base:System - Update to version 15.2.1: - Install sg.conf under /usr/lib/modules-load.d (bsc#1036463) * sg.conf: avoid file conflict with systemd - Update to version 15.2.0: * weak-modules2: emit "inconsistent" warning only if replacement fails (bsc#1127155) OBS-URL: https://build.opensuse.org/request/show/710013 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=68 --- _servicedata | 2 +- suse-module-tools-15.1.13.tar.xz | 3 --- suse-module-tools-15.2.1.tar.xz | 3 +++ suse-module-tools.changes | 14 ++++++++++++++ suse-module-tools.spec | 14 +++++++++----- 5 files changed, 27 insertions(+), 9 deletions(-) delete mode 100644 suse-module-tools-15.1.13.tar.xz create mode 100644 suse-module-tools-15.2.1.tar.xz diff --git a/_servicedata b/_servicedata index bb687d1..b157636 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 53810546ce76fb4a95fe2cb4ce6a08f41dafb797 \ No newline at end of file + 87377bc6831558e779958f4101f7266e8de4d2a8 \ No newline at end of file diff --git a/suse-module-tools-15.1.13.tar.xz b/suse-module-tools-15.1.13.tar.xz deleted file mode 100644 index f9ad79f..0000000 --- a/suse-module-tools-15.1.13.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:336ebd9a368d9400355792de07177fef5ccea2ce31d964927fb54d37589762d0 -size 26136 diff --git a/suse-module-tools-15.2.1.tar.xz b/suse-module-tools-15.2.1.tar.xz new file mode 100644 index 0000000..b35253c --- /dev/null +++ b/suse-module-tools-15.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ab40aa3517b112f2f24c47b430a7c457fa8b5a6edea967c4d207bd2fe87a0ed +size 26216 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 05e4dc0..637dec0 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jun 14 14:52:19 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.1: +- Install sg.conf under /usr/lib/modules-load.d (bsc#1036463) + * sg.conf: avoid file conflict with systemd + +------------------------------------------------------------------- +Fri Jun 14 10:06:55 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.0: + * weak-modules2: emit "inconsistent" warning only if replacement fails + (bsc#1127155) + ------------------------------------------------------------------- Fri May 17 06:18:33 UTC 2019 - Dominique Leuenberger diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 47eb7cd..18fc8f4 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -16,6 +16,10 @@ # +# Define _rpmmacrodir if it's not defined yet +%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d} +%define modules_load_dir /usr/lib/modules-load.d + # List of legacy file systems to be blacklisted by default %if 0%{?is_opensuse} %global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs f2fs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs @@ -25,7 +29,7 @@ %endif Name: suse-module-tools -Version: 15.1.13 +Version: 15.2.1 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -121,8 +125,8 @@ install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_libexecdir}/systemd/syste # Ensure that the sg driver is loaded early (bsc#1036463) # Not needed in SLE11, where sg is loaded via udev rule. -install -d -m 755 "%{buildroot}%{_sysconfdir}/modules-load.d" -install -pm 644 sg.conf "%{buildroot}%{_sysconfdir}/modules-load.d" +install -d -m 755 "%{buildroot}%{modules_load_dir}" +install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}" mkdir -p %{buildroot}%{_defaultlicensedir} @@ -259,8 +263,8 @@ done %{_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 +%dir %{modules_load_dir} +%{modules_load_dir}/sg.conf %files legacy %defattr(-,root,root) From fbe5f4d85cda738a848317ea4f8df4f90c932e11735b3792ad26d37f6d10ec4e Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 18 Jun 2019 13:12:46 +0000 Subject: [PATCH 2/3] Accepting request 710576 from home:mwilck:branches:Base:System - Update to version 15.2.2: * kmp-install, driver-check.sh, weak-modules2: Support for compressed kernel modules (bsc#1135854) OBS-URL: https://build.opensuse.org/request/show/710576 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=69 --- _servicedata | 2 +- suse-module-tools-15.2.1.tar.xz | 3 --- suse-module-tools-15.2.2.tar.xz | 3 +++ suse-module-tools.changes | 7 +++++++ suse-module-tools.spec | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 suse-module-tools-15.2.1.tar.xz create mode 100644 suse-module-tools-15.2.2.tar.xz diff --git a/_servicedata b/_servicedata index b157636..b59d26a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 87377bc6831558e779958f4101f7266e8de4d2a8 \ No newline at end of file + e8aed1643240ace9eea4c7c4848041d13b8f712d \ No newline at end of file diff --git a/suse-module-tools-15.2.1.tar.xz b/suse-module-tools-15.2.1.tar.xz deleted file mode 100644 index b35253c..0000000 --- a/suse-module-tools-15.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ab40aa3517b112f2f24c47b430a7c457fa8b5a6edea967c4d207bd2fe87a0ed -size 26216 diff --git a/suse-module-tools-15.2.2.tar.xz b/suse-module-tools-15.2.2.tar.xz new file mode 100644 index 0000000..141d7b5 --- /dev/null +++ b/suse-module-tools-15.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:615ab6571c75cb2b5d58097778b5bce7ed4626b1ae74b91b9c863f80854203e5 +size 26216 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 637dec0..7f49019 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 18 13:08:07 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.2: + * kmp-install, driver-check.sh, weak-modules2: + Support for compressed kernel modules (bsc#1135854) + ------------------------------------------------------------------- Fri Jun 14 14:52:19 UTC 2019 - mwilck@suse.com diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 18fc8f4..1368148 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -29,7 +29,7 @@ %endif Name: suse-module-tools -Version: 15.2.1 +Version: 15.2.2 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later From 785cdc4fe5ecbc0a8c8e32ebb22e56c4da4713687e2a6d19ed3b064ff563a3f8 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 1 Jul 2019 20:23:16 +0000 Subject: [PATCH 3/3] Accepting request 712918 from home:mwilck:branches:Base:System - Update to version 15.2.3: * softdep of bridge on br_netfilter (bsc#937216, bsc#1134819) OBS-URL: https://build.opensuse.org/request/show/712918 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=70 --- _servicedata | 2 +- suse-module-tools-15.2.2.tar.xz | 3 --- suse-module-tools-15.2.3.tar.xz | 3 +++ suse-module-tools.changes | 6 ++++++ suse-module-tools.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 suse-module-tools-15.2.2.tar.xz create mode 100644 suse-module-tools-15.2.3.tar.xz diff --git a/_servicedata b/_servicedata index b59d26a..d06e397 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - e8aed1643240ace9eea4c7c4848041d13b8f712d \ No newline at end of file + 22cf1c54dbe945eb9554b79be090413ad82a16ef \ No newline at end of file diff --git a/suse-module-tools-15.2.2.tar.xz b/suse-module-tools-15.2.2.tar.xz deleted file mode 100644 index 141d7b5..0000000 --- a/suse-module-tools-15.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:615ab6571c75cb2b5d58097778b5bce7ed4626b1ae74b91b9c863f80854203e5 -size 26216 diff --git a/suse-module-tools-15.2.3.tar.xz b/suse-module-tools-15.2.3.tar.xz new file mode 100644 index 0000000..b60c5c8 --- /dev/null +++ b/suse-module-tools-15.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1b9493e7ca1ff2f35a249a70891b8860045222c8ac904256e4c83b6dc52e622 +size 26312 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 7f49019..732d5ed 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 01 20:18:55 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.3: + * softdep of bridge on br_netfilter (bsc#937216, bsc#1134819) + ------------------------------------------------------------------- Tue Jun 18 13:08:07 UTC 2019 - mwilck@suse.com diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 1368148..1257975 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -29,7 +29,7 @@ %endif Name: suse-module-tools -Version: 15.2.2 +Version: 15.2.3 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later