diff options
Diffstat (limited to 'v4l/scripts/buildpatch')
| -rw-r--r-- | v4l/scripts/buildpatch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/v4l/scripts/buildpatch b/v4l/scripts/buildpatch index 8404ba471..39caee1bf 100644 --- a/v4l/scripts/buildpatch +++ b/v4l/scripts/buildpatch @@ -68,6 +68,9 @@ sub filter_source ($$) { if ($line =~ m/^#include \"compat.h\"/) { next; } + if ($line =~ m/[\$]Id:.*/) { + next; + } if ($line =~ /^#ifdef MM_KERNEL/) { chomp($line); $state = "if"; @@ -171,7 +174,7 @@ sub makediff ($$) { my $tmp = "/tmp/src.$$"; my $tmp2 = "/tmp/dst.$$"; - filter_source("$here","$tmp"); + filter_source("../linux/$here","$tmp"); if (-f "$LINUX/$kernel") { filter_dest("$LINUX/$kernel","$tmp2"); @@ -241,7 +244,7 @@ while (my $line = <CONFIG>) { if ($line =~ /srcdiff\s+(\S+)\s+(\S+)/) { print STDERR "srcdiff $2\n"; - makediff($1,$2); + makediff($2,$2); } elsif ($line =~ /delete\s+(\S+)/) { print STDERR "delete $1\n"; |