add dvb-core to v4l/dvb merged-trees build environment

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

2 files changed, 22 insertions, 20 deletions

diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 5e8173cbe..56a24bc28 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -29,19 +29,20 @@ 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
-@@ -36,5 +36,8 @@ endif
+@@ -37,5 +37,9 @@ endif
  ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
 + CONFIG_DVB_BT8XX       := m
-+ CONFIG_DVB_BT8XX_DST   := n
++ CONFIG_DVB_BT8XX_DST   := m
 + CONFIG_DVB_FRONTENDS    := m
++ CONFIG_DVB_CORE        := 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
-@@ -81,6 +81,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -85,6 +85,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -49,7 +50,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)
-@@ -189,7 +187,7 @@ export LC_ALL
+@@ -197,7 +195,7 @@ export LC_ALL
  default:: links .version
  	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
  
@@ -58,17 +59,17 @@ 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 '{}' . \;
  
-@@ -201,7 +202,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 '{}' . \;
+@@ -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 '{}' . \;
  
 -install:: rminstall
 +install:: rminstall dvb-install
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -267,7 +268,7 @@ dvb-rminstall::
- 		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
+@@ -283,7 +284,7 @@ dvb-rminstall::
+ 		$(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null
  	@echo
  
 -rminstall::
@@ -76,7 +77,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) \
-@@ -290,7 +291,7 @@ rminstall::
+@@ -304,7 +305,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 e294c65d7..96f8b395e 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -10,19 +10,20 @@ 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
-@@ -36,8 +36,5 @@ endif
+@@ -37,9 +37,5 @@ endif
  ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
 - CONFIG_DVB_BT8XX       := m
-- CONFIG_DVB_BT8XX_DST   := n
+- CONFIG_DVB_BT8XX_DST   := m
 - CONFIG_DVB_FRONTENDS    := m
+- CONFIG_DVB_CORE        := 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
-@@ -81,7 +81,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -85,7 +85,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -30,7 +31,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)
-@@ -190,7 +189,7 @@ export LC_ALL
+@@ -198,7 +197,7 @@ export LC_ALL
  default:: links .version
  	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
  
@@ -39,17 +40,17 @@ 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 '{}' . \;
  
-@@ -202,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 '{}' . \;
+@@ -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 '{}' . \;
  
 -install:: rminstall dvb-install
 +install:: rminstall
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -268,7 +267,7 @@ dvb-rminstall::
- 		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
+@@ -284,7 +283,7 @@ dvb-rminstall::
+ 		$(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null
  	@echo
  
 -rminstall:: dvb-rminstall
@@ -57,7 +58,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) \
-@@ -291,7 +292,7 @@ rminstall:: dvb-rminstall
+@@ -305,7 +306,7 @@ rminstall:: dvb-rminstall
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)