aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-07-25 17:23:20 +0000
committerThierry Vignaud <tv@mageia.org>2012-07-25 17:23:20 +0000
commitf47afe0f97f656f05badd8bbee22a045fa8a12e7 (patch)
tree2884c1c2f777a2400ed462602dfd19ca47ce5cf0
parent73f9d115e69ab000a2fa4fadd3b4bf31f4c94534 (diff)
downloadrpm-setup-f47afe0f97f656f05badd8bbee22a045fa8a12e7.tar
rpm-setup-f47afe0f97f656f05badd8bbee22a045fa8a12e7.tar.gz
rpm-setup-f47afe0f97f656f05badd8bbee22a045fa8a12e7.tar.bz2
rpm-setup-f47afe0f97f656f05badd8bbee22a045fa8a12e7.tar.xz
rpm-setup-f47afe0f97f656f05badd8bbee22a045fa8a12e7.zip
merge patches from package repository: have kmod.prov handle .xz
compressed modules as well (tmb)
-rw-r--r--NEWS1
-rwxr-xr-xkmod.prov2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f9a4143..68ed77a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
- merge patches from package repository:
o fix build with rpm-4.9+
o fix %rename macro
+ o have kmod.prov handle .xz compressed modules as well
Version 1.148 - 25 Jul 2012, by Thierry Vignaud
- drop automatically generated dependencies on interpreters we either don't
diff --git a/kmod.prov b/kmod.prov
index ca00c33..6ad60b6 100755
--- a/kmod.prov
+++ b/kmod.prov
@@ -1,7 +1,7 @@
#!/bin/sh
provideslist=`sed "s/['\"]/\\\&/g"`
-modulelist=$(echo "$provideslist" | egrep '^.*(/lib/modules/|/var/lib/dkms/).*\.ko(\.gz)?$')
+modulelist=$(echo "$provideslist" | egrep '^.*(/lib/modules/|/var/lib/dkms/).*\.ko(\.[g,x]z)?$')
echo $modulelist | xargs -r /sbin/modinfo | \
perl -lne '
$name = $1 if m!^filename:\s*(?:.*/)?([^/]+)\.k?o!;