diff options
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index ffff46bce..9ef965988 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -24,39 +24,6 @@ for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do ln -f -s $DVB/$x $V4L/$x done -ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c -ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h -ln -s $V4L/drivers/media/dvb/frontends/mt352.c mt352.c -ln -s $V4L/drivers/media/dvb/frontends/mt352.h mt352.h -ln -s $V4L/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h -ln -s $V4L/drivers/media/dvb/frontends/cx22702.c cx22702.c -ln -s $V4L/drivers/media/dvb/frontends/cx22702.h cx22702.h -ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c -ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h -ln -s $V4L/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h -ln -s $V4L/drivers/media/dvb/frontends/or51132.c or51132.c -ln -s $V4L/drivers/media/dvb/frontends/or51132.h or51132.h -ln -s $V4L/drivers/media/dvb/frontends/tda1004x.c tda1004x.c -ln -s $V4L/drivers/media/dvb/frontends/tda1004x.h tda1004x.h -ln -s $V4L/drivers/media/dvb/frontends/sp887x.c sp887x.c -ln -s $V4L/drivers/media/dvb/frontends/sp887x.h sp887x.h -ln -s $V4L/drivers/media/dvb/frontends/nxt6000.c nxt6000.c -ln -s $V4L/drivers/media/dvb/frontends/nxt6000.h nxt6000.h -ln -s $V4L/drivers/media/dvb/frontends/nxt6000_priv.h nxt6000_priv.h -ln -s $V4L/drivers/media/dvb/frontends/cx24110.c cx24110.c -ln -s $V4L/drivers/media/dvb/frontends/cx24110.h cx24110.h -ln -s $V4L/drivers/media/dvb/frontends/or51211.c or51211.c -ln -s $V4L/drivers/media/dvb/frontends/or51211.h or51211.h -ln -s $V4L/drivers/media/dvb/bt8xx/bt878.c bt878.c -ln -s $V4L/drivers/media/dvb/bt8xx/bt878.h bt878.h -ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.c dvb-bt8xx.c -ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.h dvb-bt8xx.h -ln -s $V4L/drivers/media/dvb/bt8xx/dst.c dst.c -ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.c dst_ca.c -ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.h dst_ca.h -ln -s $V4L/drivers/media/dvb/bt8xx/dst_common.h dst_common.h -ln -s $V4L/drivers/media/dvb/bt8xx/dst_priv.h dst_priv.h - cd $CWD patch -p2 <<'DIFF' diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config @@ -73,7 +40,7 @@ diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile --- v4l-kernel.orig/v4l/Makefile 2005-10-08 17:31:57.000000000 -0400 +++ v4l-kernel/v4l/Makefile 2005-10-08 17:45:48.000000000 -0400 -@@ -68,6 +68,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -69,6 +69,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB @@ -81,7 +48,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -182,7 +183,7 @@ links:: +@@ -184,7 +185,7 @@ links:: @ln -sf ../linux/drivers/media/common/ir-common.c . @@ -90,7 +57,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -245,7 +246,7 @@ dvb-rminstall:: +@@ -247,7 +248,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -99,7 +66,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ -@@ -266,7 +267,7 @@ rminstall:: +@@ -268,7 +269,7 @@ rminstall:: rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |