1
0

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
This commit is contained in:
Martin Wilck 2019-06-14 16:06:06 +00:00 committed by Git OBS Bridge
parent 661b89ed34
commit 98c35999a4
5 changed files with 27 additions and 9 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">53810546ce76fb4a95fe2cb4ce6a08f41dafb797</param></service></servicedata>
<param name="changesrevision">87377bc6831558e779958f4101f7266e8de4d2a8</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:336ebd9a368d9400355792de07177fef5ccea2ce31d964927fb54d37589762d0
size 26136

View File

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

View File

@ -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 <dimstar@opensuse.org>

View File

@ -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)