- 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 3af49c170..38f8055ab 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-25 16:51  mkrufky
+
+	* ../v4l/scripts/merge-trees.sh:
+	* ../v4l/scripts/unmerge-trees.sh:
+	- fix offsets
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-10-25 16:33  mkrufky
 
 	* ../v4l/Make.config:
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index fcbe09a0e..c231f9161 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
+@@ -33,5 +33,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)
+@@ -71,6 +71,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)
-@@ -171,7 +172,7 @@ export LC_ALL
+@@ -173,7 +174,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 '{}' . \;
  	@find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
-@@ -184,7 +185,7 @@ links::
+@@ -186,7 +187,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)
-@@ -247,7 +248,7 @@ dvb-rminstall::
+@@ -249,7 +250,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) \
-@@ -268,7 +269,7 @@ rminstall::
+@@ -270,7 +271,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 90b2ee2ca..e8516accf 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
+@@ -33,7 +33,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)
+@@ -71,7 +71,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)
-@@ -172,7 +171,7 @@ export LC_ALL
+@@ -174,7 +173,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 '{}' . \;
  	@find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
-@@ -185,7 +184,7 @@ links::
+@@ -187,7 +186,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)
-@@ -248,7 +247,7 @@ dvb-rminstall::
+@@ -250,7 +249,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) \
-@@ -269,7 +268,7 @@ rminstall:: dvb-rminstall
+@@ -271,7 +270,7 @@ rminstall:: dvb-rminstall
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)