import kmod-25-13.el8

This commit is contained in:
CentOS Sources 2019-11-05 15:20:17 -05:00 committed by Andrew Lukoshko
parent 6c5ae9df97
commit db1ceb686b
2 changed files with 27 additions and 7 deletions

View File

@ -966,6 +966,7 @@ add_kernel() {
local krel=${1:-$(uname -r)} local krel=${1:-$(uname -r)}
local tmp local tmp
local no_force_update="" local no_force_update=""
local num
tmp=$(mktemp -p $tmpdir) tmp=$(mktemp -p $tmpdir)
@ -983,10 +984,29 @@ add_kernel() {
# reuse tmp # reuse tmp
# optimization, check independent modules in one run.
# first try groups with one element in each.
# it means independent modules, so we can safely remove
# incompatible links
# some cut and paste here
echo > $tmp
for g in "${groups[@]}"; do for g in "${groups[@]}"; do
printf '%s\n' $g > $tmp num="$(echo "$g" | wc -w)"
[ "$num" -gt 1 ] && continue
printf '%s\n' $g >> $tmp
done
# to avoid subshell, see the read_modules_list comment # to avoid subshell, see the read_modules_list comment
read_modules_list < $tmp read_modules_list < $tmp
update_modules_for_krel $krel add_weak_links force_update
for g in "${groups[@]}"; do
num="$(echo "$g" | wc -w)"
[ "$num" -eq 1 ] && continue
printf '%s\n' $g > $tmp
read_modules_list < $tmp
update_modules_for_krel $krel add_weak_links $no_force_update update_modules_for_krel $krel add_weak_links $no_force_update
done done
done done

View File

@ -1,6 +1,6 @@
Name: kmod Name: kmod
Version: 25 Version: 25
Release: 11%{?dist}.2 Release: 13%{?dist}
Summary: Linux kernel module management utilities Summary: Linux kernel module management utilities
Group: System Environment/Kernel Group: System Environment/Kernel
@ -123,13 +123,13 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf
%{_libdir}/libkmod.so %{_libdir}/libkmod.so
%changelog %changelog
* Wed Apr 3 2019 Yauheni Kaliuta <ykaliuta@redhat.com> - 25-11.el8_0.2 * Tue Apr 16 2019 Yauheni Kaliuta <ykaliuta@redhat.com> - 25-13
- Rebuild because of gating. - weak-modules: handle independent modules in one run
Related: rhbz#1695557 Resolves: rhbz#1695763
* Wed Apr 3 2019 Yauheni Kaliuta <ykaliuta@redhat.com> - 25-11.el8_0.1 * Tue Apr 2 2019 Yauheni Kaliuta <ykaliuta@redhat.com> - 25-12
- weak-modules: use asterisk for kernel version in sandbox - weak-modules: use asterisk for kernel version in sandbox
Resolves: rhbz#1695557 Resolves: rhbz#1689052
* Tue Feb 5 2019 Yauheni Kaliuta <ykaliuta@redhat.com> - 25-11 * Tue Feb 5 2019 Yauheni Kaliuta <ykaliuta@redhat.com> - 25-11
- add PKCS7/openssl support. - add PKCS7/openssl support.