Alter build configuration for official merged v4l+dvb development tree.

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

4 files changed, 68 insertions, 256 deletions

diff --git a/v4l/Make.config b/v4l/Make.config
index bc77fd7fa..ab9d0841e 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -19,48 +19,77 @@ CONFIG_VIDEO_ADV_DEBUG	:= y
 
 # doesn't build on kernels older than 2.6.12
 
-CONFIG_VIDEO_BUF_DVB    := n
-CONFIG_VIDEO_CX88_DVB	:= n
-CONFIG_VIDEO_SAA7134_DVB := n
+CONFIG_VIDEO_BUF_DVB		:= n
+CONFIG_VIDEO_CX88_DVB		:= n
+CONFIG_VIDEO_SAA7134_DVB	:= n
 
 # requires merged v4l/dvb tree
 
-CONFIG_DVB_BT8XX        := n
-CONFIG_DVB_BT8XX_DST    := n
-CONFIG_DVB_FRONTENDS    := n
-CONFIG_DVB_CORE		:= n
-CONFIG_DVB_B2C2_FLEXCOP	:= n
-CONFIG_DVB_B2C2_FLEXCOP_PCI := n
-CONFIG_DVB_B2C2_FLEXCOP_USB := n
-CONFIG_DVB_CINERGYT2	:= n
-CONFIG_DVB_USB		:= n
-CONFIG_DVB_USB_VP7045	:= n
-CONFIG_DVB_USB_VP702X	:= n
-CONFIG_DVB_USB_DTT200U	:= n
-CONFIG_DVB_USB_A800	:= n
-CONFIG_DVB_USB_DIBUSB_MB := n
-CONFIG_DVB_USB_DIBUSB_MC := n
-CONFIG_DVB_USB_NOVA_T_USB2 := n
-CONFIG_DVB_USB_UMT_010	:= n
-CONFIG_DVB_USB_DIGITV	:= n
-CONFIG_DVB_USB_CXUSB	:= n
-CONFIG_DVB_PLUTO2	:= n
-CONFIG_DVB_BUDGET	:= n
-CONFIG_DVB_BUDGET_AV	:= n
-CONFIG_DVB_BUDGET_CI	:= n
-CONFIG_DVB_BUDGET_PATCH	:= n
-CONFIG_DVB_AV7110	:= n
-CONFIG_DVB_TTUSB_BUDGET	:= n
-CONFIG_DVB_TTUSB_DEC	:= n
-CONFIG_VIDEO_SAA7146	:= n
-CONFIG_VIDEO_SAA7146_VV	:= n
+CONFIG_DVB_BT8XX		:= n
+CONFIG_DVB_BT8XX_DST		:= n
+CONFIG_DVB_FRONTENDS		:= n
+CONFIG_DVB_CORE			:= n
+CONFIG_DVB_B2C2_FLEXCOP		:= n
+CONFIG_DVB_B2C2_FLEXCOP_PCI	:= n
+CONFIG_DVB_B2C2_FLEXCOP_USB	:= n
+CONFIG_DVB_CINERGYT2		:= n
+CONFIG_DVB_USB			:= n
+CONFIG_DVB_USB_VP7045		:= n
+CONFIG_DVB_USB_VP702X		:= n
+CONFIG_DVB_USB_DTT200U		:= n
+CONFIG_DVB_USB_A800		:= n
+CONFIG_DVB_USB_DIBUSB_MB	:= n
+CONFIG_DVB_USB_DIBUSB_MC	:= n
+CONFIG_DVB_USB_NOVA_T_USB2	:= n
+CONFIG_DVB_USB_UMT_010		:= n
+CONFIG_DVB_USB_DIGITV		:= n
+CONFIG_DVB_USB_CXUSB		:= n
+CONFIG_DVB_PLUTO2		:= n
+CONFIG_DVB_BUDGET		:= n
+CONFIG_DVB_BUDGET_AV		:= n
+CONFIG_DVB_BUDGET_CI		:= n
+CONFIG_DVB_BUDGET_PATCH		:= n
+CONFIG_DVB_AV7110		:= n
+CONFIG_DVB_TTUSB_BUDGET		:= n
+CONFIG_DVB_TTUSB_DEC		:= n
+CONFIG_VIDEO_SAA7146		:= n
+CONFIG_VIDEO_SAA7146_VV		:= n
 
 ifneq ($(KERNELRELEASE),)
  CONFIG_VIDEO_BUF_DVB := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo m)
 endif
 
 ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
- CONFIG_VIDEO_CX88_DVB	:= m
- CONFIG_VIDEO_SAA7134_DVB := m
+ CONFIG_VIDEO_CX88_DVB		:= m
+ CONFIG_VIDEO_SAA7134_DVB	:= m
+ CONFIG_DVB_BT8XX		:= m
+ 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 --git a/v4l/Makefile b/v4l/Makefile
index 2dc073538..6d8ab5bb7 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -140,6 +140,7 @@ ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y)
 endif
 
 # for DVB
+EXTRA_CFLAGS += -DDVB_CVS=1
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
 ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
@@ -271,18 +272,13 @@ default:: links .version
 
 links::
 	@echo creating symbolic links...
-	@find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
+	@find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
 
 #	@find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \;
 
 	@ln -sf ../linux/drivers/media/common/ir-common.c .
 
-dvb-links::
-	@find ../linux/drivers/media/common -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
-	@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)
@@ -317,15 +313,9 @@ v4l_install:: rminstall
 
 	/sbin/depmod -a
 
-kernel-links:: merge-trees
+kernel-links::
 	cd ..;	v4l/scripts/makelinks.sh $(KDIR)
 
-merge-trees::
-	@scripts/merge-trees.sh
-
-unmerge-trees::
-	@scripts/unmerge-trees.sh
-
 dvb-install:: dvb-rminstall
 	@echo -e "\nInstalling new DVB modules at corresponding Kernel dir..."
 
@@ -389,7 +379,7 @@ dvb-rminstall::
 		$(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null
 	@echo
 
-rminstall::
+rminstall:: dvb-rminstall
 	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
 
 	-@rm -r $(DEST) \
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
deleted file mode 100644
index e5c699a8c..000000000
--- a/v4l/scripts/merge-trees.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-PWD=`pwd`
-CWD=$PWD
-
-cd ../linux
-V4L=$PWD
-cd ../../dvb-kernel/linux
-DVB=$PWD
-
-for x in `find drivers/media/dvb -type d | grep -v CVS | grep -v patches | grep -v compat` ; do
-	mkdir -p -v $V4L/$x
-done
-
-echo creating symbolic links...
-
-mkdir -p -v $V4L/include/linux/dvb
-
-for x in `find drivers -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -f -s $DVB/$x $V4L/$x
-done
-
-for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -f -s $DVB/$x $V4L/$x
-done
-
-cd $CWD
-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
-@@ -62,5 +62,34 @@ 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   := 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
-@@ -140,6 +140,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
- endif
- 
- # for DVB
-+EXTRA_CFLAGS += -DDVB_CVS=1
- EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
- EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
- ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -269,7 +267,7 @@ export LC_ALL
- default:: links .version
- 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
- 
--links::
-+links:: dvb-links
- 	@echo creating symbolic links...
- 	@find ../linux/drivers/media/video -name '*.[c,h]' -type f -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)
-@@ -389,7 +390,7 @@ dvb-rminstall::
- 		$(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null
- 	@echo
- 
--rminstall::
-+rminstall:: dvb-rminstall
- 	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
- 
- 	-@rm -r $(DEST) \
-@@ -410,7 +411,7 @@ rminstall::
- rmmodules::
- 	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
- 
--clean::
-+clean:: unmerge-trees
- 	find . -name '*.c' -type l -exec rm '{}' \;
- 	find . -name '*.h' -type l -exec rm '{}' \;
- 	-rm -f *~ *.o *.ko *.mod.c
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
deleted file mode 100644
index e01390a10..000000000
--- a/v4l/scripts/unmerge-trees.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-echo removing symlinks
-cd ..
-for x in `find linux -type l` ; do 
-    rm -rf $x 2> /dev/null
-done
-cd v4l
-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
-@@ -62,34 +62,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   := 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
-@@ -140,7 +140,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
- endif
- 
- # for DVB
--EXTRA_CFLAGS += -DDVB_CVS=1
- EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
- EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
- ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -270,7 +269,7 @@ export LC_ALL
- default:: links .version
- 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
- 
--links:: dvb-links
-+links::
- 	@echo creating symbolic links...
- 	@find ../linux/drivers/media/video -name '*.[c,h]' -type f -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)
-@@ -390,7 +389,7 @@ dvb-rminstall::
- 		$(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null
- 	@echo
- 
--rminstall:: dvb-rminstall
-+rminstall::
- 	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
- 
- 	-@rm -r $(DEST) \
-@@ -411,7 +412,7 @@ rminstall:: dvb-rminstall
- rmmodules::
- 	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
- 
--clean:: unmerge-trees
-+clean::
- 	find . -name '*.c' -type l -exec rm '{}' \;
- 	find . -name '*.h' -type l -exec rm '{}' \;
- 	-rm -f *~ *.o *.ko *.mod.c