From 6576f848b83cf5861d0affd9b67119a8f5e3ea78 Mon Sep 17 00:00:00 2001 From: Yauheni Kaliuta Date: Tue, 10 Aug 2021 12:10:38 +0300 Subject: [PATCH] Add default config file (28-6) External modules packaging depends on the search order provided by RHEL default config which is missing now from CentOS Stream. Add and install the file. Revision update, 28-6. Resolves: rhbz#1985100 Signed-off-by: Yauheni Kaliuta --- depmod.conf.dist | 6 ++++++ kmod.spec | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 depmod.conf.dist diff --git a/depmod.conf.dist b/depmod.conf.dist new file mode 100644 index 0000000..8513288 --- /dev/null +++ b/depmod.conf.dist @@ -0,0 +1,6 @@ +# +# depmod.conf +# + +# override default search ordering for kmod packaging +search updates extra built-in weak-updates diff --git a/kmod.spec b/kmod.spec index 353db21..a49a7cd 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,12 +1,13 @@ Name: kmod Version: 28 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Linux kernel module management utilities License: GPLv2+ URL: https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git Source0: https://www.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz Source1: weak-modules +Source2: depmod.conf.dist Exclusiveos: Linux BuildRequires: gcc @@ -78,6 +79,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %files %dir %{_sysconfdir}/depmod.d @@ -92,6 +94,7 @@ install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules %{_sbindir}/depmod %{_sbindir}/weak-modules %{_datadir}/bash-completion/ +%{_sysconfdir}/depmod.d/dist.conf %attr(0644,root,root) %{_mandir}/man5/*.5* %attr(0644,root,root) %{_mandir}/man8/*.8* %doc NEWS README TODO @@ -106,6 +109,10 @@ install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules %{_libdir}/libkmod.so %changelog +* Tue Aug 10 2021 Yauheni Kaliuta - 28-6 +- add default config. + Resolves: rhbz#1985100 + * Mon Aug 09 2021 Mohan Boddu - 28-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688