diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 03:55:26 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 03:55:26 +0000 |
| commit | 02811d3e7cd6c7f0f433a2e6ac6e78158aaf7e67 (patch) | |
| tree | 86cd22c4b116857eece82fe46a42443a75da6d03 /v4l | |
| parent | 993b84b81732121fd8953d0fb4429415290efba9 (diff) | |
| download | mediapointer-dvb-s2-02811d3e7cd6c7f0f433a2e6ac6e78158aaf7e67.tar.gz mediapointer-dvb-s2-02811d3e7cd6c7f0f433a2e6ac6e78158aaf7e67.tar.bz2 | |
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>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 13 | ||||
| -rw-r--r-- | v4l/scripts/buildpatch | 7 | ||||
| -rw-r--r-- | v4l/scripts/cardlist | 20 |
3 files changed, 28 insertions, 12 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 8f6fa3b7c..1a0924239 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,16 @@ +2005-10-09 03:52 mchehab + + * ../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> + 2005-10-09 03:31 mchehab * ../Makefile: 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"; diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index 22faa67b0..7253b1e03 100644 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -1,18 +1,18 @@ #!/bin/sh -scripts/bttv.pl bttv.h bttv-cards.c \ - | perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.bttv +scripts/bttv.pl ../linux/drivers/media/video/bttv.h ../linux/drivers/media/video/bttv-cards.c \ + | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.bttv -scripts/cx88.pl cx88.h cx88-cards.c \ - | perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.cx88 +scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \ + | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx88 -./scripts/em2820.pl em2820-cards.c \ - | perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.em2820 -cat tuner-simple.c \ +./scripts/em2820.pl ../linux/kernel/drivers/usb/media/em2820-cards.c \ + | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.em2820 +cat ../linux/drivers/media/video/tuner-simple.c \ | grep "{ \"" \ | perl -ne '/"([^"]+)"/; printf("tuner=%d - %s\n",$i++,$1)' \ - | perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.tuner + | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.tuner -scripts/saa7134.pl saa7134.h saa7134-cards.c \ - | perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.saa7134 +scripts/saa7134.pl ../linux/drivers/media/video/saa7134/saa7134.h ../linux/drivers/media/video/saa7134/saa7134-cards.c \ + | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.saa7134 |