forked from rpm/suse-module-tools
Accepting request 913288 from Base:System
- Update to version 16.0.8+1: * spec file: fix BuildRequires (forwarded request 913286 from mwilck) OBS-URL: https://build.opensuse.org/request/show/913288 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-module-tools?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
49f69c625e
1
_service
1
_service
@ -15,6 +15,7 @@
|
||||
<param name="files">*/suse-module-tools.spec</param>
|
||||
<param name="outfilename">suse-module-tools.spec</param>
|
||||
</service>
|
||||
<service name="set_version" mode="manual"/>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
|
||||
<param name="changesrevision">8d786330ba9510ca0793556e2b0df3de3e034e8a</param></service></servicedata>
|
||||
<param name="changesrevision">ec6c895407f494c886dd4de6ef58e5d2641f0962</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:09f5dcecc5140ea325b45752a2e69e8e1ca46fd84597d43dce685432296c16a3
|
||||
size 98827
|
||||
3
suse-module-tools-16.0.8+1.obscpio
Normal file
3
suse-module-tools-16.0.8+1.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b15abb5d60d3832fb7d079aacb3b08440eb48ece4e964b4f6d29c669c4ff4cf
|
||||
size 101387
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 20 09:05:54 UTC 2021 - Martin Wilck <mwilck@suse.com>
|
||||
|
||||
- Update to version 16.0.8+1:
|
||||
* spec file: fix BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 19 18:53:24 UTC 2021 - Martin Wilck <mwilck@suse.com>
|
||||
|
||||
- Update to version 16.0.8:
|
||||
* fix problem that initrd may not be rebuilt after installing
|
||||
kernel-$flavor-extra (bsc#1189441)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 19 11:31:32 UTC 2021 - Martin Wilck <mwilck@suse.com>
|
||||
|
||||
- Update to version 16.0.7:
|
||||
* add kernel-sysctl.service and boot-sysctl.service for applying
|
||||
kernel-specific sysctl settings (bsc#1184804)
|
||||
* add support for zstd-compressed kernel modules
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 15:14:47 UTC 2021 - Martin Wilck <mwilck@suse.com>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: suse-module-tools
|
||||
version: 16.0.6
|
||||
mtime: 1625260529
|
||||
commit: 8d786330ba9510ca0793556e2b0df3de3e034e8a
|
||||
version: 16.0.8+1
|
||||
mtime: 1629449992
|
||||
commit: ec6c895407f494c886dd4de6ef58e5d2641f0962
|
||||
|
||||
|
||||
@ -24,10 +24,17 @@
|
||||
%if 0%{?suse_version} >= 1550
|
||||
%global modprobe_dir /usr/lib/modprobe.d
|
||||
%global depmod_dir /usr/lib/depmod.d
|
||||
%global with_kernel_sysctl 1
|
||||
# boot_sysctl may be dropped on TW when we can assume that nobody keeps
|
||||
# kernel packages around that store sysctl files under /boot
|
||||
%bcond_without boot_sysctl
|
||||
%else
|
||||
%global modprobe_dir /lib/modprobe.d
|
||||
%global depmod_dir /lib/depmod.d
|
||||
%global with_boot_sysctl 1
|
||||
%endif
|
||||
%global sysctl_dropin %{_unitdir}/systemd-sysctl.service.d/50-kernel-uname_r.conf
|
||||
%global systemd_units %{?with_boot_sysctl:boot-sysctl.service} %{?with_kernel_sysctl:kernel-sysctl.service}
|
||||
|
||||
# List of legacy file systems to be blacklisted by default
|
||||
%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs
|
||||
@ -38,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.6
|
||||
Version: 16.0.8+1
|
||||
Release: 0
|
||||
Summary: Configuration for module loading and SUSE-specific utilities for KMPs
|
||||
License: GPL-2.0-or-later
|
||||
@ -46,6 +53,7 @@ Group: System/Base
|
||||
URL: https://github.com/openSUSE/suse-module-tools
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: %{name}.rpmlintrc
|
||||
BuildRequires: systemd-rpm-macros
|
||||
Requires: /usr/bin/grep
|
||||
Requires: /usr/bin/gzip
|
||||
Requires: /usr/bin/sed
|
||||
@ -132,9 +140,17 @@ install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-
|
||||
install -d -m 755 "%{buildroot}%{_prefix}/bin"
|
||||
install -pm 755 kmp-install "%{buildroot}%{_bindir}/"
|
||||
|
||||
# systemd service to load /boot/sysctl.conf-`uname -r`
|
||||
# systemd service(s) to load kernel-specific sysctl settings
|
||||
install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
|
||||
install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
|
||||
echo '[Unit]' >"%{buildroot}%{sysctl_dropin}"
|
||||
%if %{with kernel_sysctl}
|
||||
install -m 644 kernel-sysctl.service "%{buildroot}%{_unitdir}"
|
||||
echo 'Wants=kernel-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
|
||||
%endif
|
||||
%if %{with boot_sysctl}
|
||||
install -m 644 boot-sysctl.service "%{buildroot}%{_unitdir}"
|
||||
echo 'Wants=boot-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
|
||||
%endif
|
||||
|
||||
# Ensure that the sg driver is loaded early (bsc#1036463)
|
||||
# Not needed in SLE11, where sg is loaded via udev rule.
|
||||
@ -163,10 +179,8 @@ install $mod /usr/lib/module-init-tools/unblacklist $mod; /sbin/modprobe --ignor
|
||||
done
|
||||
%endif
|
||||
|
||||
%post
|
||||
exit 0
|
||||
|
||||
%pre
|
||||
%service_add_pre %{systemd_units}
|
||||
# Avoid restoring old .rpmsave files in %posttrans
|
||||
for f in %{modprobe_conf_rpmsave}; do
|
||||
if [ -f ${f} ]; then
|
||||
@ -179,6 +193,18 @@ if [ -f %{_sysconfdir}/depmod.d/00-system.conf.rpmsave ]; then
|
||||
fi
|
||||
exit 0
|
||||
|
||||
%post
|
||||
%service_add_post %{systemd_units}
|
||||
exit 0
|
||||
|
||||
%preun
|
||||
%service_del_preun %{systemd_units}
|
||||
exit 0
|
||||
|
||||
%postun
|
||||
%service_del_postun_without_restart %{systemd_units}
|
||||
exit 0
|
||||
|
||||
%posttrans
|
||||
# If the user had modified any of the configuration files installed under
|
||||
# /etc, they'll now be renamed to .rpmsave files. Restore them.
|
||||
@ -208,6 +234,7 @@ exit 0
|
||||
%{_bindir}/kmp-install
|
||||
/usr/lib/module-init-tools
|
||||
%exclude /usr/lib/module-init-tools/weak-modules
|
||||
%{_unitdir}/*.service
|
||||
%{_unitdir}/systemd-sysctl.service.d
|
||||
%{_modulesloaddir}
|
||||
%ifarch ppc64 ppc64le
|
||||
|
||||
Loading…
Reference in New Issue
Block a user