[Modconf-commits] r200 - trunk/modconf/debian

[Frank Lichtenheld]

Author: djpig
Date: 2006-11-10 11:51:17 +0100 (Fri, 10 Nov 2006)
New Revision: 200

Modified:
   trunk/modconf/debian/changelog
   trunk/modconf/debian/mkkerneldesc.pl
Log:
Make the description parse script slightly more intelligent
to find more descriptions.


Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog	2006-11-10 10:03:28 UTC (rev 199)
+++ trunk/modconf/debian/changelog	2006-11-10 10:51:17 UTC (rev 200)
@@ -5,6 +5,8 @@
     Upload with high urgency for RC bug fix.
   * Fix a FTBFS probably related to changes in the apply script
     for kernel patches.
+  * Make the description parse script slightly more intelligent
+    to find more descriptions.
   * Bump debhelper compat level to 5.
   * Bump Standards-Version to 3.7.2 (no changes).
 

Modified: trunk/modconf/debian/mkkerneldesc.pl
===================================================================
--- trunk/modconf/debian/mkkerneldesc.pl	2006-11-10 10:03:28 UTC (rev 199)
+++ trunk/modconf/debian/mkkerneldesc.pl	2006-11-10 10:51:17 UTC (rev 200)
@@ -90,6 +90,7 @@
 }
 
 sub main26 {
+   my (%summary_count, %summaries);
    open(fi, "find $linux | grep Kconfig\$ |") || die "find failed" ;
    Kconfig: foreach(<fi>) {
       my %dstrings;
@@ -105,14 +106,26 @@
          }
       }
       while(<mk>) {
-         if(/obj-..(\w+).*=\s*(\w+)\.o/) {
-            if(defined($dstrings{$1})) {
-               print "summary_$2=\"$dstrings{$1}\"\n";
-            }
+         if(/obj-..(\w+).*=\s*((?:[\w-]+\.o\s*)+)$/) {
+	    my ($var, $files) = ($1, $2);
+	    warn "line=$_ var=$var files=$files" if $opt_d;
+	    my @files = ($files =~ /([\w-]+)\.o/g);
+	    warn "files=".join(":", at files)."\n" if $opt_d;
+	    foreach (@files) {
+                if(defined($dstrings{$var}) and !$summary_count{$_}++) {
+                   warn "summary_$_=\"$dstrings{$var}\"\n" if $opt_d;
+		   $summaries{$_} = $dstrings{$var};
+                   print "summary_$_=\"$dstrings{$var}\"\n";
+                }
+	    }
          }
       }
       close(kc);
       close(mk);
    }
+   warn "please check wether the following modules need a summary override\n";
+   while (my ($var, $count) = each %summary_count)  {
+       warn "multiple ($count) descriptions found for $var, used '$summaries{$var}'\n" if $count > 1;
+   }
    return 1;
 }