diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-03 09:05:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-03 09:05:48 -0300 |
| commit | 4b4cfb8489ff8196a61622a93e3f6aded289ac09 (patch) | |
| tree | 45a15a28ada876e5c4d98b64198e7c0c47ff6539 /v4l | |
| parent | 98aefa945652e91c27390a0cf4de452edacd2be7 (diff) | |
| parent | 7626144ace9fbb7b98d1f581c8c2b415e59d606e (diff) | |
| download | mediapointer-dvb-s2-4b4cfb8489ff8196a61622a93e3f6aded289ac09.tar.gz mediapointer-dvb-s2-4b4cfb8489ff8196a61622a93e3f6aded289ac09.tar.bz2 | |
Merge from pascoe
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 13 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 37 |
2 files changed, 49 insertions, 1 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 73058a1e9..1af345804 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -217,6 +217,11 @@ $(obj)/av7110_firm.h: $(obj)/fdump EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE endif +ifeq ($(ARCH),) +ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/s390x/s390/ -e s/parisc64/parisc/ ) +endif ################################################# # compile modules @@ -346,6 +351,10 @@ all:: default default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules +qconfig:: links .version + ./scripts/make_kconfig.pl /usr/src/linux-2.6.14 $(ARCH) + $(KDIR)/scripts/kconfig/qconf Kconfig + pvrusb2:: @echo creating pvrusb2 symbolic links... @find ../v4l_experimental/pvrusb2 -name '*.[ch]' -type f -exec ln -sf '{}' . \; @@ -524,7 +533,9 @@ 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 .pvrusb2-merge + -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ + ivtv-svnversion.h .pvrusb2-merge \ + Kconfig Kconfig.kern .config .config.cmd distclean:: clean -rm -f .version .*.o.flags .*.o.d diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl new file mode 100755 index 000000000..f612e83db --- /dev/null +++ b/v4l/scripts/make_kconfig.pl @@ -0,0 +1,37 @@ +#!/usr/bin/perl +use FileHandle; + +my $KDIR=shift; +my $ARCH=shift; + +sub open_kconfig($$) { + my ($dir,$file)=@_; + my $in = new FileHandle; + +print "opening $file\n"; + open $in,"$file"; + while (<$in>) { + if (m;^\s*source[\s\"]+drivers/media/(video|dvb)/Kconfig;) { + next; + } + if (m|^\s*source[\s\"]+([^\n\s\"]+)[\n\s\"]|) { + open_kconfig($dir,"$dir/$1"); + next; + } + s/^main(menu\s\"[^\"]+)/\1 - DON'T CHANGE IT!/; + print OUT $_; + } + close $in; +} + +open OUT,">Kconfig.kern"; +open_kconfig($KDIR,"$KDIR/arch/$ARCH/Kconfig"); +print OUT "endmenu\n"; +close OUT; + +open OUT,">Kconfig"; +print OUT "mainmenu \"V4L/DVB menu\"\n"; +open_kconfig ("../linux","../linux/drivers/media/video/Kconfig"); +open_kconfig ("../linux","../linux/drivers/media/dvb/Kconfig"); +print OUT "source Kconfig.kern\n"; +close OUT; |