diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-02-16 23:11:16 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-02-16 23:11:16 -0500 |
| commit | c5afcf940212386e9ddb07960b1922b1b110571f (patch) | |
| tree | cccfd70b5f0635e318e981a80cf86392d13ecc8e /v4l | |
| parent | 661d60c7bfbc5c9f4fc76d85c33ef4ae2aaadddf (diff) | |
| download | mediapointer-dvb-s2-c5afcf940212386e9ddb07960b1922b1b110571f.tar.gz mediapointer-dvb-s2-c5afcf940212386e9ddb07960b1922b1b110571f.tar.bz2 | |
update 'make pvrusb2' merged build command
From: Michael Krufky <mkrufky@linuxtv.org>
- 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 <mkrufky@linuxtv.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 7 | ||||
| -rw-r--r-- | v4l/Makefile | 9 | ||||
| -rwxr-xr-x | v4l/scripts/merge-pvrusb2.sh | 51 |
3 files changed, 9 insertions, 58 deletions
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) diff --git a/v4l/Makefile b/v4l/Makefile index d89639307..c3bfdfaf5 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -344,10 +344,9 @@ default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules pvrusb2:: - @scripts/merge-pvrusb2.sh - -pvrusb2-unmerge:: -# patch -R -p1 < scripts/merge-pvrusb2.sh + @echo creating pvrusb2 symbolic links... + @find ../v4l_experimental/pvrusb2 -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @echo 'm' > .pvrusb2-merge ivtv-checkout:: @if [ ! -d ivtv ]; then \ @@ -522,7 +521,7 @@ rmmodules:: clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; - -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h + -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h .pvrusb2-merge distclean:: clean -rm -f .version .*.o.flags .*.o.d diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh deleted file mode 100755 index a43ba32a4..000000000 --- a/v4l/scripts/merge-pvrusb2.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -PWD=`pwd` -CWD=$PWD - -cd ../v4l_experimental/pvrusb2 -PVRUSB2=$PWD - -echo creating pvrusb2 symbolic links... - -for x in `find . -type f -name '*.[c,h]'` ; do - ln -f -s $PVRUSB2/$x $CWD/$x -done - -cd $CWD -patch -p1 <<'DIFF' ---- v4l.orig/Make.config -+++ v4l/Make.config -@@ -17,7 +17,7 @@ - - CONFIG_VIDEO_ADV_DEBUG := y - --CONFIG_VIDEO_PVRUSB2 := n -+CONFIG_VIDEO_PVRUSB2 := m - - # doesn't build on older kernels - ---- v4l.orig/Makefile -+++ v4l/Makefile -@@ -319,10 +319,10 @@ - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - - pvrusb2:: -- @scripts/merge-pvrusb2.sh -+# @scripts/merge-pvrusb2.sh - - pvrusb2-unmerge:: --# patch -R -p1 < scripts/merge-pvrusb2.sh -+ patch -R -p1 < scripts/merge-pvrusb2.sh - - ivtv-checkout:: - @if [ ! -d ivtv ]; then \ -@@ -464,7 +467,7 @@ dvb-rminstall:: - rmmodules:: - rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) - --clean:: -+clean:: pvrusb2-unmerge - @find . -name '*.c' -type l -exec rm '{}' \; - @find . -name '*.h' -type l -exec rm '{}' \; - -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump |