diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-08 22:15:14 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-08 22:15:14 +0000 |
| commit | ed3f5753507ae961501e4c68d52eb37308431661 (patch) | |
| tree | a78a3020f2dd2b232ed93fefa6fc7a2291cfb167 /v4l | |
| parent | f8fd8d1da6d456f25c17f824b73c3988c9a169a0 (diff) | |
| download | mediapointer-dvb-s2-ed3f5753507ae961501e4c68d52eb37308431661.tar.gz mediapointer-dvb-s2-ed3f5753507ae961501e4c68d52eb37308431661.tar.bz2 | |
fix tree-merging scripts for new v4l-kernel tree
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 80 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 6 |
2 files changed, 43 insertions, 43 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index fd660891c..ffdfe25d9 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -1,43 +1,43 @@ #!/bin/sh echo creating symlinks -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.c mt352.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.h mt352.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c cx22702.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.h cx22702.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c or51132.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h or51132.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c tda1004x.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.h tda1004x.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/sp887x.c sp887x.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/sp887x.h sp887x.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000.c nxt6000.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000.h nxt6000.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000_priv.h nxt6000_priv.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx24110.c cx24110.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx24110.h cx24110.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51211.c or51211.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51211.h or51211.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/bt878.c bt878.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/bt878.h bt878.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c dvb-bt8xx.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h dvb-bt8xx.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst.c dst.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_ca.c dst_ca.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_ca.h dst_ca.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_common.h dst_common.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_priv.h dst_priv.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvbdev.h dvbdev.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dmxdev.h dmxdev.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_demux.h dvb_demux.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_net.h dvb_net.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_frontend.h dvb_frontend.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.c mt352.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.h mt352.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c cx22702.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.h cx22702.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c or51132.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h or51132.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c tda1004x.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.h tda1004x.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/sp887x.c sp887x.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/sp887x.h sp887x.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000.c nxt6000.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000.h nxt6000.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000_priv.h nxt6000_priv.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/cx24110.c cx24110.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/cx24110.h cx24110.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/or51211.c or51211.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/frontends/or51211.h or51211.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/bt878.c bt878.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/bt878.h bt878.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c dvb-bt8xx.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h dvb-bt8xx.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst.c dst.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_ca.c dst_ca.c +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_ca.h dst_ca.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_common.h dst_common.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_priv.h dst_priv.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvbdev.h dvbdev.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dmxdev.h dmxdev.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_demux.h dvb_demux.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_net.h dvb_net.h +ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_frontend.h dvb_frontend.h patch -p1 <<'DIFF' diff -up video4linux.orig/Make.config video4linux/Make.config --- video4linux.orig/Make.config 2005-10-06 16:03:26.000000000 -0400 @@ -81,7 +81,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -147,6 +150,9 @@ inst_cx88 := cx8800.ko cx8802.ko cx88-al +@@ -148,6 +151,9 @@ inst_cx88 := cx8800.ko cx8802.ko cx88-al inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko inst_usb := em2820.ko @@ -91,7 +91,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) -@@ -166,6 +172,12 @@ install:: rminstall +@@ -174,6 +180,12 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common @@ -104,7 +104,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile -install -d $(KDIR26)/video -install -m 644 -c $(inst_video) $(KDIR26)/video -@@ -196,12 +208,14 @@ rminstall:: +@@ -204,12 +216,14 @@ rminstall:: -@rm -r $(DEST) \ $(addprefix $(KDIR26)/common/, $(inst_common)) \ $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 8147a483b..c9817131c 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -81,7 +81,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -150,9 +147,6 @@ inst_cx88 := cx8800.ko cx8802.ko cx88-al +@@ -151,9 +148,6 @@ inst_cx88 := cx8800.ko cx8802.ko cx88-al inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko inst_usb := em2820.ko @@ -91,7 +91,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) -@@ -172,12 +166,6 @@ install:: rminstall +@@ -180,12 +174,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common @@ -104,7 +104,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile -install -d $(KDIR26)/video -install -m 644 -c $(inst_video) $(KDIR26)/video -@@ -208,14 +196,12 @@ rminstall:: +@@ -216,14 +204,12 @@ rminstall:: -@rm -r $(DEST) \ $(addprefix $(KDIR26)/common/, $(inst_common)) \ $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ |