aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-03-03 16:48:13 (GMT)
committerThomas Backlund <tmb@mageia.org>2011-03-03 16:48:13 (GMT)
commit6c9f3ce49b9ead6fc2417f8d8fa51a2d2bbea89e (patch)
tree6654442e2f815ba16b07c5e67f6f66c5af0b08a3
parentae8535e29203ed23a1efc7767a4597729cdc48ec (diff)
- kmod.prov: convert special chars [,],:,- to _ when generating1.120
kernel module version provides (needed with rpm-4.8.1)
-rw-r--r--NEWS4
-rw-r--r--configure.ac2
-rwxr-xr-xkmod.prov1
3 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 084a837..721e3f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 1.120 - 3 March 2011, by Thomas Backlund
+- kmod.prov: convert special chars [,],:,- to _ when generating
+ kernel module version provides (needed with rpm-4.8.1)
+
Version 1.119 - 2 March 2011, by Jerome Quelin
- make v1.118 work with perl modules having a number followed by a _ in
their name, and a fully qualified VERSION (eg $l1_cache::VERSION = ...)
diff --git a/configure.ac b/configure.ac
index e3c34b3..416e66d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.119, jquelin@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.120, tmb@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability)
AC_CONFIG_SRCDIR
diff --git a/kmod.prov b/kmod.prov
index 95b05b2..2f0dd02 100755
--- a/kmod.prov
+++ b/kmod.prov
@@ -6,6 +6,7 @@ echo $modulelist | xargs -r /sbin/modinfo | \
perl -lne '
$name = $1 if m!^filename:\s*(?:.*/)?([^/]+)\.k?o!;
$ver = $1 if /^version:\s*[a-zA-Z]{0,6}\-?(\d+[\.\:\-\[\]]?\d*[\.\:\-\[\]]?\d*[\.\:\-\[\]]?\d*[\.\:\-\[\]]?\d*-?[a-zA-Z]{0,6}\d?).*/;
+$ver =~ s/(\[|\]|\:|-)/_/;
if (/^vermagic:/) {
print "kmod\($name\)" . ($ver ? " = $ver" : "") if $name;
undef $name; undef $ver;