From 179101e553fff3cbc08b9a7200cbf2b689da8088 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Tue, 28 Sep 2021 16:11:18 +0200 Subject: [PATCH] Detect compressed kernel modules - Resolves: #2008544 --- find-provides | 2 +- find-requires | 2 +- redhat-rpm-config.spec | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/find-provides b/find-provides index be1669d..9d3bd73 100755 --- a/find-provides +++ b/find-provides @@ -30,7 +30,7 @@ done is_kmod=1 for f in $filelist; do - if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ] + if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ] then is_kernel=1; fi diff --git a/find-requires b/find-requires index a9596ba..1fe480a 100755 --- a/find-requires +++ b/find-requires @@ -22,7 +22,7 @@ filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` unset is_kmod for f in $filelist; do - if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ] + if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ] then is_kmod=1; elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ] diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 17b951d..d242914 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 194 +Version: 195 Release: 1%{?dist} # No version specified. License: GPL+ @@ -213,6 +213,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Wed Jun 15 2022 Florian Festi - 195-1 +- Detect compressed kernel modules +- Resolves: rhbz#2008544 + * Thu Feb 17 2022 Nick Clifton - 194-1 - Use the correct package names for the triggers. - Resolves: rhbz#2030671