2
0

Accepting request 949775 from Base:System

- Update to version 16.0.19:
  * Add /etc/modprobe.d/README on SLE/Leap (bsc#1195051)
  * rpm-script: force-copy kernel to /boot (boo#1194501) (forwarded request 949774 from mwilck)

OBS-URL: https://build.opensuse.org/request/show/949775
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-module-tools?expand=0&rev=54
This commit is contained in:
Dominique Leuenberger 2022-02-01 13:02:38 +00:00 committed by Git OBS Bridge
commit b90ea3f498
6 changed files with 30 additions and 8 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">d6673b607cbaaa15cd9622a0a4f8a9f98efa5676</param></service></servicedata>
<param name="changesrevision">3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1</param></service></servicedata>

View File

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

View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 28 21:00:00 UTC 2022 - Martin Wilck <mwilck@suse.com>
- Update to version 16.0.19:
* Add /etc/modprobe.d/README on SLE/Leap (bsc#1195051)
* rpm-script: force-copy kernel to /boot (boo#1194501)
-------------------------------------------------------------------
Tue Jan 4 13:32:10 UTC 2022 - Martin Wilck <mwilck@suse.com>

View File

@ -1,4 +1,4 @@
name: suse-module-tools
version: 16.0.18
mtime: 1641302892
commit: d6673b607cbaaa15cd9622a0a4f8a9f98efa5676
version: 16.0.19
mtime: 1643402151
commit: 3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1

View File

@ -45,7 +45,7 @@
%global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
Name: suse-module-tools
Version: 16.0.18
Version: 16.0.19
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities for KMPs
License: GPL-2.0-or-later
@ -108,6 +108,20 @@ sed -i 's/@FS_BLACKLIST@.*/%{fs_blacklist}/' README.md
%install
install -d -m 755 "%{buildroot}%{modprobe_dir}"
install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d"
# keep /etc clean on Tumbleweed
%if 0%{?suse_version} < 1550
cat > "%{buildroot}%{_sysconfdir}/modprobe.d/README" <<EOF
Local configuration for modprobe(8)
===================================
The distribution-provided modprobe configuration files have moved to %{modprobe_dir}.
To modify the configuration, copy files from %{modprobe_dir} to this directory
(%{_sysconfdir}/modprobe.d) and edit them here.
See also %{modprobe_dir}/README, %{_defaultdocdir}/%{name}/README.md, and the
man page modprobe.d(5).
EOF
%endif
install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/common/*.conf
if [ -d modprobe.conf/%{_arch} ]; then
install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/%{_arch}/*.conf
@ -246,6 +260,7 @@ exit 0
%{depmod_dir}
%dir %{_sysconfdir}/depmod.d
%if 0%{?suse_version} < 1550
%{_sysconfdir}/modprobe.d/README
%{_rpmmacrodir}/macros.initrd
%endif
%{_bindir}/kmp-install