fix offsets

        - fix offsets

Signed-off-by: Michael Krufky <mkrufky@m1k.net>

3 files changed, 20 insertions, 12 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 4ad4f05b7..167484c34 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-20 23:54  mkrufky
+
+	* ../v4l/scripts/merge-trees.sh:
+	* ../v4l/scripts/unmerge-trees.sh:
+	- fix offsets
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-11-20 23:06  mkrufky
 
 	* ../v4l/Makefile:
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index ebe995feb..3446ecd5c 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -29,7 +29,7 @@ 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
-@@ -32,5 +32,7 @@ endif
+@@ -35,5 +35,7 @@ endif
  ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
@@ -40,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
-@@ -69,6 +69,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -80,6 +80,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -48,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)
-@@ -173,7 +174,7 @@ export LC_ALL
+@@ -188,7 +186,7 @@ export LC_ALL
  default:: links .version
  	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
  
@@ -57,7 +57,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
  	@echo creating symbolic links...
  	@find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
  
-@@ -185,7 +186,7 @@ links::
+@@ -200,7 +201,7 @@ links::
  	@find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
  	@find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
  
@@ -66,7 +66,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)
-@@ -251,7 +252,7 @@ dvb-rminstall::
+@@ -266,7 +267,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
  	@echo
  
@@ -75,7 +75,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) \
-@@ -274,7 +275,7 @@ rminstall::
+@@ -289,7 +290,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 ed139f276..4fb7347c7 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -10,7 +10,7 @@ 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
-@@ -32,7 +32,5 @@ endif
+@@ -35,7 +35,5 @@ endif
  ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
@@ -21,7 +21,7 @@ diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config
 diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
 --- v4l-kernel/v4l/Makefile	2005-10-08 17:45:48.000000000 -0400
 +++ v4l-kernel.orig/v4l/Makefile	2005-10-08 17:31:57.000000000 -0400
-@@ -69,7 +69,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -80,7 +80,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -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)
-@@ -174,7 +173,7 @@ export LC_ALL
+@@ -189,7 +188,7 @@ export LC_ALL
  default:: links .version
  	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
  
@@ -38,7 +38,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
  	@echo creating symbolic links...
  	@find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
  
-@@ -186,7 +185,7 @@ links::
+@@ -201,7 +200,7 @@ links::
  	@find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
  	@find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
  
@@ -47,7 +47,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)
-@@ -252,7 +251,7 @@ dvb-rminstall::
+@@ -267,7 +266,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
  	@echo
  
@@ -56,7 +56,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) \
-@@ -275,7 +276,7 @@ rminstall:: dvb-rminstall
+@@ -290,7 +291,7 @@ rminstall:: dvb-rminstall
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)