summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-10-12 04:14:28 +0000
committerMichael Krufky <devnull@localhost>2005-10-12 04:14:28 +0000
commit88f3c2e02e592296bae990a977020240e160f431 (patch)
tree97159aa42043ddf4b17f2a7f7fe25b67a94295e4
parent723e8923174092825f6ffe13559fe0abc6f38552 (diff)
downloadmediapointer-dvb-s2-88f3c2e02e592296bae990a977020240e160f431.tar.gz
mediapointer-dvb-s2-88f3c2e02e592296bae990a977020240e160f431.tar.bz2
fix fuzz & offsets
-rw-r--r--v4l/scripts/merge-trees.sh10
-rw-r--r--v4l/scripts/unmerge-trees.sh10
2 files changed, 10 insertions, 10 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index e823ce2e9..c01e8ad08 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -27,8 +27,8 @@ patch -p2 <<'DIFF'
diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config
--- v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400
+++ v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400
-@@ -31,5 +31,7 @@ endif
- ifeq ($(need_dvb),yes)
+@@ -32,5 +32,7 @@ endif
+ ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
CONFIG_VIDEO_CX88_DVB := m
CONFIG_VIDEO_SAA7134_DVB := m
+ CONFIG_DVB_BT8XX := m
@@ -46,7 +46,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)
-@@ -177,7 +178,7 @@ links::
+@@ -180,7 +181,7 @@ links::
@ln -sf ../linux/drivers/media/common/ir-common.c .
@@ -55,7 +55,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)
-@@ -240,7 +241,7 @@ dvb-rminstall::
+@@ -243,7 +244,7 @@ dvb-rminstall::
$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
@echo
@@ -64,7 +64,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) \
-@@ -261,7 +262,7 @@ rminstall::
+@@ -264,7 +265,7 @@ rminstall::
rmmodules::
rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 6cc72d025..702ddb165 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -10,8 +10,8 @@ patch -p2 <<'DIFF'
diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config
--- v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400
+++ v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400
-@@ -31,7 +31,5 @@ endif
- ifeq ($(need_dvb),yes)
+@@ -32,7 +32,5 @@ endif
+ ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
CONFIG_VIDEO_CX88_DVB := m
CONFIG_VIDEO_SAA7134_DVB := m
- CONFIG_DVB_BT8XX := m
@@ -29,7 +29,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/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)
-@@ -178,7 +177,7 @@ links::
+@@ -181,7 +180,7 @@ links::
@ln -sf ../linux/drivers/media/common/ir-common.c .
@@ -38,7 +38,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
@strip --strip-debug $(inst-m)
-@@ -241,7 +240,7 @@ dvb-rminstall::
+@@ -244,7 +243,7 @@ dvb-rminstall::
$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
@echo
@@ -47,7 +47,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
-@rm -r $(DEST) \
-@@ -262,7 +261,7 @@ rminstall:: dvb-rminstall
+@@ -265,7 +264,7 @@ rminstall:: dvb-rminstall
rmmodules::
rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)