Add all remaining dvb modules into merge-trees build

- add install configuration for dvb-kernel modules to Makefile.
- enable all remaining dvb-kernel modules in merge-trees build environment.

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

2 files changed, 66 insertions, 16 deletions

diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 56a24bc28..0fc294416 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
-@@ -37,5 +37,9 @@ endif
+@@ -62,5 +62,34 @@ endif
  ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
@@ -37,12 +37,37 @@ diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config
 + CONFIG_DVB_BT8XX_DST   := m
 + CONFIG_DVB_FRONTENDS    := m
 + CONFIG_DVB_CORE        := m
++ CONFIG_DVB_B2C2_FLEXCOP := m
++ CONFIG_DVB_B2C2_FLEXCOP_PCI := m
++ CONFIG_DVB_B2C2_FLEXCOP_USB := m
++ CONFIG_DVB_CINERGYT2    := m
++ CONFIG_DVB_USB          := m
++ CONFIG_DVB_USB_VP7045   := m
++ CONFIG_DVB_USB_VP702X   := m
++ CONFIG_DVB_USB_DTT200U  := m
++ CONFIG_DVB_USB_A800     := m
++ CONFIG_DVB_USB_DIBUSB_MB := m
++ CONFIG_DVB_USB_DIBUSB_MC := m
++ CONFIG_DVB_USB_NOVA_T_USB2 := m
++ CONFIG_DVB_USB_UMT_010  := m
++ CONFIG_DVB_USB_DIGITV   := m
++ CONFIG_DVB_USB_CXUSB    := m
++ CONFIG_DVB_PLUTO2       := m
++ CONFIG_DVB_BUDGET       := m
++ CONFIG_DVB_BUDGET_AV    := m
++ CONFIG_DVB_BUDGET_CI    := m
++ CONFIG_DVB_BUDGET_PATCH := m
++ CONFIG_DVB_AV7110       := m
++ CONFIG_DVB_TTUSB_BUDGET := m
++ CONFIG_DVB_TTUSB_DEC    := m
++ CONFIG_VIDEO_SAA7146    := m
++ CONFIG_VIDEO_SAA7146_VV := m
  endif
  
 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
-@@ -85,6 +85,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -140,6 +140,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -50,7 +75,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)
-@@ -197,7 +195,7 @@ export LC_ALL
+@@ -269,7 +267,7 @@ export LC_ALL
  default:: links .version
  	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
  
@@ -59,16 +84,16 @@ 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 '{}' . \;
  
-@@ -211,7 +212,7 @@ links::
- 	@find ../linux/drivers/media/dvb/dvb-core -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
- 	@find ../linux/include/linux/dvb -name '*.h' -type l -exec ln -sf '{}' . \;
+@@ -282,7 +283,7 @@ links::
+ 	@find ../linux/drivers/media/dvb -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+ 	@find ../linux/include -name '*.h' -type l -exec ln -sf '{}' . \;
  
 -install:: rminstall
 +install:: rminstall dvb-install
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -283,7 +284,7 @@ dvb-rminstall::
+@@ -375,7 +376,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null
  	@echo
  
@@ -77,7 +102,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) \
-@@ -304,7 +305,7 @@ rminstall::
+@@ -396,7 +397,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 96f8b395e..aa4fd1974 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
-@@ -37,9 +37,5 @@ endif
+@@ -62,34 +62,5 @@ endif
  ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
@@ -18,12 +18,37 @@ diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config
 - CONFIG_DVB_BT8XX_DST   := m
 - CONFIG_DVB_FRONTENDS    := m
 - CONFIG_DVB_CORE        := m
+- CONFIG_DVB_B2C2_FLEXCOP := m
+- CONFIG_DVB_B2C2_FLEXCOP_PCI := m
+- CONFIG_DVB_B2C2_FLEXCOP_USB := m
+- CONFIG_DVB_CINERGYT2    := m
+- CONFIG_DVB_USB          := m
+- CONFIG_DVB_USB_VP7045   := m
+- CONFIG_DVB_USB_VP702X   := m
+- CONFIG_DVB_USB_DTT200U  := m
+- CONFIG_DVB_USB_A800     := m
+- CONFIG_DVB_USB_DIBUSB_MB := m
+- CONFIG_DVB_USB_DIBUSB_MC := m
+- CONFIG_DVB_USB_NOVA_T_USB2 := m
+- CONFIG_DVB_USB_UMT_010  := m
+- CONFIG_DVB_USB_DIGITV   := m
+- CONFIG_DVB_USB_CXUSB    := m
+- CONFIG_DVB_PLUTO2       := m
+- CONFIG_DVB_BUDGET       := m
+- CONFIG_DVB_BUDGET_AV    := m
+- CONFIG_DVB_BUDGET_CI    := m
+- CONFIG_DVB_BUDGET_PATCH := m
+- CONFIG_DVB_AV7110       := m
+- CONFIG_DVB_TTUSB_BUDGET := m
+- CONFIG_DVB_TTUSB_DEC    := m
+- CONFIG_VIDEO_SAA7146    := m
+- CONFIG_VIDEO_SAA7146_VV := m
  endif
  
 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
-@@ -85,7 +85,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -140,7 +140,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -31,7 +56,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)
-@@ -198,7 +197,7 @@ export LC_ALL
+@@ -270,7 +269,7 @@ export LC_ALL
  default:: links .version
  	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
  
@@ -40,16 +65,16 @@ 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 '{}' . \;
  
-@@ -212,7 +211,7 @@ links::
- 	@find ../linux/drivers/media/dvb/dvb-core -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
- 	@find ../linux/include/linux/dvb -name '*.h' -type l -exec ln -sf '{}' . \;
+@@ -283,7 +284,7 @@ links::
+ 	@find ../linux/drivers/media/dvb -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+ 	@find ../linux/include -name '*.h' -type l -exec ln -sf '{}' . \;
  
 -install:: rminstall dvb-install
 +install:: rminstall
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -284,7 +283,7 @@ dvb-rminstall::
+@@ -376,7 +375,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null
  	@echo
  
@@ -58,7 +83,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) \
-@@ -305,7 +306,7 @@ rminstall:: dvb-rminstall
+@@ -397,7 +398,7 @@ rminstall:: dvb-rminstall
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)