From 02811d3e7cd6c7f0f433a2e6ac6e78158aaf7e67 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <devnull@localhost>
Date: Sun, 9 Oct 2005 03:55:26 +0000
Subject: From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>         *
 ../Makefile:         - make changelog now rebuilds cardlist

        * ../v4l/scripts/buildpatch:
        - Updated to work against ../linux

        * ../v4l/scripts/cardlist:
        - fixed to work even without symlinks

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---
 v4l/scripts/buildpatch | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'v4l/scripts/buildpatch')

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";
-- 
cgit v1.2.3