summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--v4l/scripts/merge-trees.sh28
-rw-r--r--v4l/scripts/unmerge-trees.sh2
2 files changed, 16 insertions, 14 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 56ba87c36..90021bed0 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -1,19 +1,19 @@
#!/bin/sh
-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/lgdt3302.c lgdt3302.c
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.h lgdt3302.h
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302_priv.h lgdt3302_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/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/lgdt3302.c lgdt3302.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.h lgdt3302.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302_priv.h lgdt3302_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
patch -p1 <<'DIFF'
--- video4linux.orig/Makefile 2005-07-21 21:13:31.000000000 +0000
+++ video4linux/Makefile 2005-07-21 21:21:08.000000000 +0000
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index a46b255bf..6de4527cf 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
rm dvb-pll.c
rm dvb-pll.h
rm mt352.c