updated make_kconfig.pl for Ubuntu

Message ID 4CA248CC.4040404@hoogenraad.net (mailing list archive)
State Superseded, archived
Headers

Commit Message

Jan Hoogenraad Sept. 28, 2010, 7:58 p.m. UTC
  Douglas:

Can you push the updated make_kconfig.pl ?

It is in its own HG tree on:
http://linuxtv.org/hg/~jhoogenraad/ubuntu-firedtv/

Mauro Carvalho Chehab wrote:
> Em 28-09-2010 14:48, Jan Hoogenraad escreveu:
>> Douglas:
>>
>> I have an updated make_kconfig.pl for Ububtu on:
>> http://linuxtv.org/hg/~jhoogenraad/rtl2831-r2/file/cb34ee1c29fc/v4l/scripts/make_kconfig.pl
>>
>> Could you test if make allyesconfig actually keeps FIREDTV enabled on a non-Ubuntu system ?
>>
>> If so, can you merge this version into the main stream ?
>>
>
> Ok, now it looks correct on my eyes, and it should not hurt compilation
> with make release and with distros that do a good job with their kernel
> packages.
>
> I'll let Douglas review and test, as he is the maintainer.
>
> It would be better if you could send him a diff. you may use hg diff to generate
> it against an older version, in order to merge all your make_kconfig.pl patches,
> or just create a new clone from master and apply it there.
>
> A side question: when do you intend to send us the patches for the Realtek
> rtl2831?
>
> Cheers,
> Mauro.
>
  

Patch

# HG changeset patch
# User Jan Hoogenraad <jan-conceptronic@h-i-s.nl>
# Date 1285703652 -7200
# Node ID c8e14191e48d98a19405c9f899abca30cd89bc18
# Parent  1da5fed5c8b2c626180b1a0983fe1c960b999525
Disable FIREDTV for debian/ubuntu distributions with bad header files

From: Jan Hoogenraad <jan-conceptronic@h-i-s.nl>

Disable FIREDTV for debian/ubuntu distributions with problems in header files

Priority: normal

Signed-off-by: Jan Hoogenraad <jan-conceptronic@h-i-s.nl>

diff -r 1da5fed5c8b2 -r c8e14191e48d v4l/scripts/make_kconfig.pl
--- a/v4l/scripts/make_kconfig.pl	Sun Sep 19 02:23:09 2010 -0300
+++ b/v4l/scripts/make_kconfig.pl	Tue Sep 28 21:54:12 2010 +0200
@@ -597,6 +597,9 @@ 
 disable_config('STAGING_BROKEN');
 $intopt { "DVB_MAX_ADAPTERS" } = 8;
 
+#check broken Ubuntu headers
+dmahcheck();
+
 # Check dependencies
 my %newconfig = checkdeps();
 
@@ -681,3 +684,24 @@ 
 EOF3
 	sleep 5;
 }
+
+# Check for full kernel sources and print a warning
+sub dmahcheck()
+{
+	my $dmahplace="$kernsrc/include/config/ieee1394/dma.h";
+	if (! -e $dmahplace) {
+		print <<"EOF2";
+
+***WARNING:*** File $dmahplace not present.
+This problem is at least present on Ubuntu systems:
+https://bugs.launchpad.net/ubuntu/+source/linux-kernel-headers/+bug/134222
+
+Therefore disabling FIREDTV driver.
+
+EOF2
+
+	disable_config('DVB_FIREDTV');
+
+	}
+	sleep 5;
+}