[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

3.x kernels fix for the stable module-init-tools



Please approve the updated module-init-tools package, the trivial patch
comes from upstream and has been in testing for months.

diff -u module-init-tools-3.12/debian/changelog module-init-tools-3.12/debian/changelog
--- module-init-tools-3.12/debian/changelog
+++ module-init-tools-3.12/debian/changelog
@@ -1,3 +1,9 @@
+module-init-tools (3.12-2) stable; urgency=low
+
+  * Backported upstream commit 3328d17 to support 3.x kernels.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 30 Oct 2011 03:09:19 +0100
+
 module-init-tools (3.12-1) unstable; urgency=low
 
   * New upstream release.
diff -u module-init-tools-3.12/debian/patches/series module-init-tools-3.12/debian/patches/series
--- module-init-tools-3.12/debian/patches/series
+++ module-init-tools-3.12/debian/patches/series
@@ -1,3 +1,5 @@
+commit-3328d17
+
 # fixes to be pushed upstream
 document_depmod_m
 
only in patch2:
unchanged:
--- module-init-tools-3.12.orig/debian/patches/commit-3328d17
+++ module-init-tools-3.12/debian/patches/commit-3328d17
@@ -0,0 +1,24 @@
+commit 3328d178247017affd90b7897393699f2f45227d
+Author: Michal Marek <mmarek@suse.cz>
+Date:   Mon May 30 15:58:43 2011 +0200
+
+    depmod: Handle X.Y kernel versions
+    
+    What a stupid check.
+    
+    Signed-off-by: Michal Marek <mmarek@suse.cz>
+    Signed-off-by: Jon Masters <jcm@jonmasters.org>
+
+diff --git a/depmod.c b/depmod.c
+index abfb11e..98a5efa 100644
+--- a/depmod.c
++++ b/depmod.c
+@@ -247,7 +247,7 @@ static int is_version_number(const char *version)
+ {
+ 	unsigned int dummy;
+ 
+-	return (sscanf(version, "%u.%u.%u", &dummy, &dummy, &dummy) == 3);
++	return (sscanf(version, "%u.%u", &dummy, &dummy) == 2);
+ }
+ 
+ static int old_module_version(const char *version)

-- 
ciao,
Marco

Attachment: signature.asc
Description: Digital signature


Reply to: