ich777/media_build
1
0
Fork 0
mirror of https://github.com/tbsdtv/media_build.git synced 2025-07-23 04:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect paths in scripts/patches/etc.

Browse Source 
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
This commit is contained in:
Hans Verkuil
2012-08-17 14:09:30 +02:00
parent 11658bc35d
commit 2569492c35
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linux/use_dir.pl
View File

@@ -169,8 +169,8 @@ sub get_patched_files()
open IN, $patchfile or return %files;
# Those files are always patched to add warnings about the usage of experimental version
$files{"drivers/media/dvb/dvb-core/dvbdev.c"} = 1;
$files{"drivers/media/video/v4l2-dev.c"} = 1;
$files{"drivers/media/dvb-core/dvbdev.c"} = 1;
$files{"drivers/media/v4l2-core/v4l2-dev.c"} = 1;
$files{"drivers/media/rc/rc-main.c"} = 1;
while (<IN>) {

4
linux/version_patch.pl
View File

@@ -79,9 +79,9 @@ if (!$need_patch) {
if ($need_patch) {
# Patch dvbdev
patch_file "drivers/media/dvb/dvb-core/dvbdev.c", "__init init_dvbdev", "MKDEV", $logs;
patch_file "drivers/media/dvb-core/dvbdev.c", "__init init_dvbdev", "MKDEV", $logs;
# Patch v4l2-dev
patch_file "drivers/media/video/v4l2-dev.c", "__init videodev_init", "printk", $logs;
patch_file "drivers/media/v4l2-core/v4l2-dev.c", "__init videodev_init", "printk", $logs;
# Patch rc core
patch_file "drivers/media/rc/rc-main.c", "__init rc_core_init", "rc_map_register", $logs;

18
v4l/scripts/cardlist
View File

@@ -1,28 +1,28 @@
#!/bin/sh
scripts/bttv.pl ../linux/drivers/media/video/bt8xx/bttv.h ../linux/drivers/media/video/bt8xx/bttv-cards.c \
scripts/bttv.pl ../linux/drivers/media/pci/bt8xx/bttv.h ../linux/drivers/media/pci/bt8xx/bttv-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.bttv
scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \
scripts/cx88.pl ../linux/drivers/media/pci/cx88/cx88.h ../linux/drivers/media/pci/cx88/cx88-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx88
scripts/em28xx.pl ../linux/drivers/media/video/em28xx/em28xx-cards.c ../linux/drivers/media/video/em28xx/em28xx.h \
scripts/em28xx.pl ../linux/drivers/media/usb/em28xx/em28xx-cards.c ../linux/drivers/usb/video/em28xx/em28xx.h \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.em28xx
scripts/tuner.pl ../linux/include/media/tuner.h ../linux/drivers/media/common/tuners/tuner-types.c \
scripts/tuner.pl ../linux/include/media/tuner.h ../linux/drivers/media/tuners/tuner-types.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.tuner
scripts/saa7134.pl ../linux/drivers/media/video/saa7134/saa7134.h ../linux/drivers/media/video/saa7134/saa7134-cards.c \
scripts/saa7134.pl ../linux/drivers/media/pci/saa7134/saa7134.h ../linux/drivers/media/pci/saa7134/saa7134-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.saa7134
scripts/usbvision.pl ../linux/drivers/media/video/usbvision/usbvision-cards.h ../linux/drivers/media/video/usbvision/usbvision-cards.c \
scripts/usbvision.pl ../linux/drivers/media/usb/usbvision/usbvision-cards.h ../linux/drivers/media/usb/usbvision/usbvision-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.usbvision
scripts/cx23885.pl ../linux/drivers/media/video/cx23885/cx23885.h ../linux/drivers/media/video/cx23885/cx23885-cards.c \
scripts/cx23885.pl ../linux/drivers/media/pci/cx23885/cx23885.h ../linux/drivers/media/pci/cx23885/cx23885-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx23885
scripts/au0828.pl ../linux/drivers/media/video/au0828/au0828-cards.h ../linux/drivers/media/video/au0828/au0828-cards.c \
scripts/au0828.pl ../linux/drivers/media/usb/au0828/au0828-cards.h ../linux/drivers/media/usb/au0828/au0828-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.au0828
scripts/saa7164.pl ../linux/drivers/media/video/saa7164/saa7164.h ../linux/drivers/media/video/saa7164/saa7164-cards.c \
scripts/saa7164.pl ../linux/drivers/media/pci/saa7164/saa7164.h ../linux/drivers/media/pci/saa7164/saa7164-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.saa7164

6
v4l/scripts/etc/fixdiffs/98.patch
View File

@@ -1,7 +1,7 @@
diff -upr oldtree/drivers/media/dvb/dvb-core/dvb_net.c /home/v4l/tokernel/wrk/linux-next/drivers/media/dvb/dvb-core/dvb_net.c
--- next/drivers/media/dvb/dvb-core/dvb_net.c 2010-01-15 19:05:35.000000000 -0200
+++ ../oldtree/drivers/media/dvb/dvb-core/dvb_net.c 2010-01-15 19:11:43.000000000 -0200
diff -upr oldtree/drivers/media/dvb-core/dvb_net.c /home/v4l/tokernel/wrk/linux-next/drivers/media/dvb-core/dvb_net.c
--- next/drivers/media/dvb-core/dvb_net.c 2010-01-15 19:05:35.000000000 -0200
+++ ../oldtree/drivers/media/dvb-core/dvb_net.c 2010-01-15 19:11:43.000000000 -0200
@@ -949,11 +949,8 @@ static int dvb_net_filter_sec_set(struct
(*secfilter)->filter_mask[10] = mac_mask[1];
(*secfilter)->filter_mask[11]=mac_mask[0];

8
v4l/scripts/fix_dvb_customise.pl
View File

@@ -7,7 +7,7 @@ use Fcntl ':mode';
my $debug = 0;
my $SRC = "../linux";
my $fname = "$SRC/drivers/media/dvb/frontends/Makefile";
my $fname = "$SRC/drivers/media/dvb-frontends/Makefile";
####################
# Get Makefile rules
@@ -124,7 +124,7 @@ sub parse_makefiles()
my $fname = $File::Find::name;
return if !($fname =~ m|/Makefile$|);
return if ($fname =~ m|drivers/media/dvb/frontends/|);
return if ($fname =~ m|drivers/media/dvb-frontends/|);
my ($refs, $mult) = get_makefile($fname);
@@ -212,7 +212,7 @@ sub parse_headers()
my $file = $File::Find::name;
return if !($file =~ m/\.[ch]$/);
return if ($file =~ m|drivers/media/dvb/frontends/|);
return if ($file =~ m|drivers/media/dvb-frontends/|);
open IN, $file or die "Can't open $file\n";
while (<IN>) {
@@ -239,7 +239,7 @@ sub parse_kconfigs()
my $all_sels;
return if !($file =~ m/Kconfig$/);
return if ($file =~ m|drivers/media/dvb/frontends/|);
return if ($file =~ m|drivers/media/dvb-frontends/|);
open IN, $file or die "Can't open $file\n";
while (<IN>) {