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

- Update to version 15.2.7:
  * spec file: avoid %{_libexecdir}

- Update to version 15.2.6:
  * modprobe.conf: add dependency of papr_scm on libnvdimm
    (bsc#1142152, ltc#176292, FATE#327775).

OBS-URL: https://build.opensuse.org/request/show/746406
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=76
This commit is contained in:
Martin Wilck 2019-11-07 20:40:04 +00:00 committed by Git OBS Bridge
parent 2430986e02
commit 506bf386ab
5 changed files with 29 additions and 17 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">c60957409705d36e749e9543e9889483b1115774</param></service></servicedata>
<param name="changesrevision">c5dfc586f807831053ac3c47df52b65513b5a42f</param></service></servicedata>

View File

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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Nov 07 20:34:15 UTC 2019 - mwilck@suse.com
- Update to version 15.2.7:
* spec file: avoid %{_libexecdir}
-------------------------------------------------------------------
Thu Nov 07 19:48:05 UTC 2019 - mwilck@suse.com
- Update to version 15.2.6:
* modprobe.conf: add dependency of papr_scm on libnvdimm
(bsc#1142152, ltc#176292, FATE#327775).
-------------------------------------------------------------------
Fri Aug 16 08:46:15 UTC 2019 - mwilck@suse.com

View File

@ -29,7 +29,7 @@
%endif
Name: suse-module-tools
Version: 15.2.5
Version: 15.2.7
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities for KMPs
License: GPL-2.0-or-later
@ -100,10 +100,10 @@ install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d"
install -pm 644 "depmod-00-system.conf" \
"%{buildroot}%{_sysconfdir}/depmod.d/00-system.conf"
# "module-init-tools" name hardcoded in KMPs, mkinitrd, etc.
install -d -m 755 "%{buildroot}%{_libexecdir}/module-init-tools"
install -pm 755 weak-modules{,2} "%{buildroot}%{_libexecdir}/module-init-tools/"
install -pm 755 driver-check.sh "%{buildroot}%{_libexecdir}/module-init-tools/"
# "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc.
install -d -m 755 "%{buildroot}/usr/lib/module-init-tools"
install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/"
install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/"
%if 0%{?suse_version} < 1550
# rpm macros and helper
@ -112,14 +112,14 @@ install -pm 755 driver-check.sh "%{buildroot}%{_libexecdir}/module-init-tools/"
install -d -m 755 "%{buildroot}%{_rpmmacrodir}"
install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}"
%endif
install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}%{_libexecdir}/module-init-tools/"
install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
install -d -m 755 "%{buildroot}%{_prefix}/bin"
install -pm 755 kmp-install "%{buildroot}%{_bindir}/"
# systemd service to load /boot/sysctl.conf-`uname -r`
install -d -m 755 "%{buildroot}%{_libexecdir}/systemd/system/systemd-sysctl.service.d"
install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_libexecdir}/systemd/system/systemd-sysctl.service.d"
install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
# Ensure that the sg driver is loaded early (bsc#1036463)
# Not needed in SLE11, where sg is loaded via udev rule.
@ -257,15 +257,14 @@ done
%{_rpmmacrodir}/macros.initrd
%endif
%{_bindir}/kmp-install
%{_libexecdir}/module-init-tools
%exclude %{_libexecdir}/module-init-tools/weak-modules
%{_libexecdir}/systemd/system/systemd-sysctl.service.d
/usr/lib/module-init-tools
%exclude /usr/lib/module-init-tools/weak-modules
%{_unitdir}/systemd-sysctl.service.d
%dir %{modules_load_dir}
%{modules_load_dir}/sg.conf
%files legacy
%defattr(-,root,root)
%{_libexecdir}/module-init-tools/weak-modules
/usr/lib/module-init-tools/weak-modules
%changelog