diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 10 | ||||
| -rw-r--r-- | v4l/Make.config | 1 | ||||
| -rw-r--r-- | v4l/Makefile | 3 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 13 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 13 |
5 files changed, 27 insertions, 13 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 167484c34..0b3b1e854 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-11-22 03:43 mkrufky + + * ../v4l/Make.config: + * ../v4l/Makefile: + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - Create separate build option for DST in Make.config + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-20 23:54 mkrufky * ../v4l/scripts/merge-trees.sh: diff --git a/v4l/Make.config b/v4l/Make.config index 3b34f7dcf..cef950fbf 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -26,6 +26,7 @@ CONFIG_VIDEO_SAA7134_DVB := n # requires merged v4l/dvb tree CONFIG_DVB_BT8XX := n +CONFIG_DVB_BT8XX_DST := n CONFIG_DVB_FRONTENDS := n ifneq ($(KERNELRELEASE),) diff --git a/v4l/Makefile b/v4l/Makefile index 0bda5dc51..7fb82fb21 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -59,7 +59,8 @@ obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o -obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o +obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o +obj-$(CONFIG_DVB_BT8XX_DST) += dst.o dst_ca.o obj-$(CONFIG_DVB_FRONTENDS) += cx22702.o dvb-pll.o or51132.o lgdt330x.o \ mt352.o tda1004x.o sp887x.o nxt6000.o \ cx24110.o or51211.o nxt200x.o cx24123.o diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 3446ecd5c..f1e91546c 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -29,18 +29,19 @@ 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 -@@ -35,5 +35,7 @@ endif +@@ -36,5 +36,8 @@ 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 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 -@@ -80,6 +80,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -81,6 +81,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB @@ -48,7 +49,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) -@@ -188,7 +186,7 @@ export LC_ALL +@@ -189,7 +187,7 @@ export LC_ALL default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules @@ -57,7 +58,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 '{}' . \; -@@ -200,7 +201,7 @@ links:: +@@ -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 '{}' . \; @@ -66,7 +67,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) -@@ -266,7 +267,7 @@ dvb-rminstall:: +@@ -267,7 +268,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -75,7 +76,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) \ -@@ -289,7 +290,7 @@ rminstall:: +@@ -290,7 +291,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 4fb7347c7..f5f335178 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -10,18 +10,19 @@ 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 -@@ -35,7 +35,5 @@ endif +@@ -36,8 +36,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 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 -@@ -80,7 +80,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -81,7 +81,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB @@ -29,7 +30,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) -@@ -189,7 +188,7 @@ export LC_ALL +@@ -190,7 +189,7 @@ export LC_ALL default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules @@ -38,7 +39,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 '{}' . \; -@@ -201,7 +200,7 @@ links:: +@@ -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 '{}' . \; @@ -47,7 +48,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) -@@ -267,7 +266,7 @@ dvb-rminstall:: +@@ -268,7 +267,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -56,7 +57,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) \ -@@ -290,7 +291,7 @@ rminstall:: dvb-rminstall +@@ -291,7 +292,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |