From 5544436dfdaf40b96906241f31f3fb97880440a2 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 16 Feb 2006 17:39:19 -0500 Subject: make ivtv: virtual tree merge From: Michael Krufky - 'make ivtv' will retreive the latest sources from ivtv svn trunk - 'make' will build the entire v4l-dvb tree including ivtv - 'make' (without previously running 'make ivtv') will build using previous behavior. Signed-off-by: Michael Krufky --- v4l/Make.config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'v4l/Make.config') diff --git a/v4l/Make.config b/v4l/Make.config index f8978c53b..83c695ed0 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -59,6 +59,7 @@ CONFIG_DVB_TTUSB_DEC := n CONFIG_VIDEO_SAA7146 := n CONFIG_VIDEO_SAA7146_VV := n CONFIG_DVB_FIRESAT := n +CONFIG_VIDEO_IVTV := n ifneq ($(KERNELRELEASE),) CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m) @@ -106,3 +107,4 @@ ifeq ($(CONFIG_DVB_CORE),m) CONFIG_VIDEO_SAA7146_VV := m endif +CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) -- cgit v1.2.3 From c5afcf940212386e9ddb07960b1922b1b110571f Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 16 Feb 2006 23:11:16 -0500 Subject: update 'make pvrusb2' merged build command From: Michael Krufky - use file .pvrusb2-merged to determine tree state rather than the previous method, which used a self-altering Makefile through an embedded patch in merge-pvrusb2.sh (removed) Signed-off-by: Michael Krufky --- v4l/Make.config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'v4l/Make.config') diff --git a/v4l/Make.config b/v4l/Make.config index 83c695ed0..216674ce2 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -22,6 +22,10 @@ CONFIG_VIDEO_ADV_DEBUG := y CONFIG_VIDEO_PVRUSB2 := n +CONFIG_VIDEO_IVTV := n + +CONFIG_DVB_FIRESAT := n + # doesn't build on older kernels CONFIG_DVB_CORE := n @@ -58,8 +62,6 @@ CONFIG_DVB_TTUSB_BUDGET := n CONFIG_DVB_TTUSB_DEC := n CONFIG_VIDEO_SAA7146 := n CONFIG_VIDEO_SAA7146_VV := n -CONFIG_DVB_FIRESAT := n -CONFIG_VIDEO_IVTV := n ifneq ($(KERNELRELEASE),) CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m) @@ -108,3 +110,4 @@ ifeq ($(CONFIG_DVB_CORE),m) endif CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) +CONFIG_VIDEO_PVRUSB2 := $(if $(wildcard $(src)/.pvrusb2-merge),m) -- cgit v1.2.3