The patch number 11019 was added via Trent Piepho <xy...@speakeasy.org>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Trent Piepho <xy...@speakeasy.org>
build: have make_kconfig.pl ignore comments
It was already ignoring lines that had only comments. But lines with some
non-comment code and then a comment at the end didn't have the comment
stripped. Some modules had incorrect dependencies added because comments
at the end of a "depends on" line were treated as modules names.
I strip the comments from the string that is parsed by the script, but
preserve the original line so it can be printed out with the comment still
in it when making v4l/Kconfig.
Priority: normal
Signed-off-by: Trent Piepho <xy...@speakeasy.org>
---
v4l/scripts/make_kconfig.pl | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff -r 1fd54a62abde -r 9debb0a2ec70 v4l/scripts/make_kconfig.pl
--- a/v4l/scripts/make_kconfig.pl Thu Mar 12 23:13:12 2009 -0300
+++ b/v4l/scripts/make_kconfig.pl Fri Mar 13 03:59:20 2009 -0700
@@ -277,11 +277,13 @@ sub open_kconfig($$) {
my $in_help = 0;
my $default_seen = 0;
my $if;
+ my $line;
print "Opening $file\n" if $debug;
open $in, '<', $file or die "File not found: $file";
push @kconfigfiles, $file;
while (<$in>) {
+ $line = $_;
# In our Kconfig files, the first non-help line after the
# help text always has no indention. Technically, the
# help text is ended by just by the indention decreasing,
@@ -303,7 +305,7 @@ sub open_kconfig($$) {
print OUT "\tdefault n\n";
}
print OUT "\tdepends on VIDEO_KERNEL_VERSION\n";
- $_ = sprintf($disabled_msg, $minver{$key});
+ $line = sprintf($disabled_msg, $minver{$key});
}
next;
}
@@ -319,10 +321,13 @@ sub open_kconfig($$) {
}
next if (/^\s*#/ || /^\s*$/); # skip comments and blank lines
+ # Erase any comments on this line
+ s/(?<!\\)#(.*)$//;
+
if (m|^\s*source\s+"([^"]+)"\s*$| ||
m|^\s*source\s+(\S+)\s*$|) {
open_kconfig($dir, "$dir/$1");
- $_ = ''; # don't print the source line itself
+ $line = ''; # don't print the source line itself
next;
}
@@ -453,13 +458,13 @@ sub open_kconfig($$) {
if ($disabled) {
$default_seen = 1;
- $_ = "\tdefault n\n";
+ $line = "\tdefault n\n";
}
} else {
print "Skipping $file:$. $_" if $debug;
}
} continue {
- print OUT $_;
+ print OUT $line;
}
close $in;
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/9debb0a2ec7043b75bad284a08870ae377a8c84a
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
