[redhat-rpm-config] Fix kmod.prov to deal with compressed modules (#1096349)

Josh Boyer jwboyer at fedoraproject.org
Mon May 12 19:05:46 UTC 2014


commit 1767166dd561b1a1d4117c582500fc6b32c96126
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Fri May 9 13:43:59 2014 -0400

    Fix kmod.prov to deal with compressed modules (#1096349)

 kmod.prov              |    2 +-
 redhat-rpm-config.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/kmod.prov b/kmod.prov
index 82633e9..f02d8a0 100644
--- a/kmod.prov
+++ b/kmod.prov
@@ -4,7 +4,7 @@ IFS=$'\n'
 
 for i in $(grep -E '(/lib/modules/.*\.ko|/lib/modules/.*/modules.builtin)');
 do
-	kmod=$(basename $i);
+	kmod=$(basename $i | sed -e 's/.[xg]z//');
 
 	if [ $kmod == "modules.builtin" ]; then
 		for j in $(cat $i); do
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 14c7b64..6e781b8 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: 21
+Version: 22
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -135,6 +135,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Mon May 12 2014 Josh Boyer <jwboyer at fedoraproject.org> - 22-1
+- Fix kmod.prov to deal with compressed modules (#1096349)
+
 * Wed Apr 30 2014 Jens Petersen <petersen at redhat.com> - 21-1
 - macros.ghc-srpm moved to ghc-rpm-macros package (#1089102)
 - add requires ghc-srpm-macros


More information about the scm-commits mailing list