Re: updated make_kconfig.pl for Ubuntu

[Jan Hoogenraad <jan-conceptronic@hoogenraad.net>]

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 ?


Mauro:

You are very right. I did not look far enough.

The expanded place where I expect the dma.h file would be (as I
/lib/modules/2.6.28-19-generic/build/include/config/ieee1394/dma.h

note that the letters "el" should be removed from your first expression
$dmahplace="$kernelsrc/include/config/ieee1394/dma.h";
needs to be:
$dmahplace="$kernsrc/include/config/ieee1394/dma.h";

Thanks a lot for helping !


As patch, relative to the diff you sent:

# HG changeset patch
# User Jan Hoogenraad <jan-conceptronic@h-i-s.nl>
# Date 1285695899 -7200
# Node ID 891128e7c3334e41f6c173ee5c01fddbce493b73
# Parent  cb34ee1c29fc8891ad3792b3df76031a72e39b9d
Location fix

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

Location fix

Priority: normal

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

diff -r cb34ee1c29fc -r 891128e7c333 v4l/scripts/make_kconfig.pl
--- a/v4l/scripts/make_kconfig.pl	Mon Sep 27 20:27:20 2010 +0200
+++ b/v4l/scripts/make_kconfig.pl	Tue Sep 28 19:44:59 2010 +0200
@@ -688,10 +688,7 @@
  # Check for full kernel sources and print a warning
  sub dmahcheck()
  {
-	my $dmahplace= "".$kernsrc;
-	$dmahplace =~ s-^/lib/modules/--g;
-	$dmahplace =~ s-/.*$--g;
- 
$dmahplace="/usr/src/linux-headers-$dmahplace/include/config/ieee1394/dma.h";
+	my $dmahplace="$kernsrc/include/config/ieee1394/dma.h";
  	if (! -e $dmahplace) {
  		print <<"EOF2";


Mauro Carvalho Chehab wrote:
> Em 27-09-2010 17:45, Jan Hoogenraad escreveu:
>> Mauro:
>>
>> On my system, the call to make_kconfig reads:
>> ./scripts/make_kconfig.pl /lib/modules/2.6.28-19-generic/build /lib/modules/2.6.28-19-generic/build 1
>>
>> Using $kernelsrc yields the following error:
>> Global symbol "$kernelsrc" requires explicit package name at ./scripts/make_kconfig.pl line 694.
>>
>> Using
>> $dmahplace="$kernsrc/include/config/ieee1394/dma.h";
>> yields the following INCORRECT expansion:
>> /lib/modules/2.6.28-19-generic/build/include/config/ieee1394/dma.h
>> this is the place where I am building into, which is different from the place where Ubuntu places the include files from the package
>>
>> Thus I built an expression to get:
>> /usr/src/linux-headers-2.6.28-19-generic/include/config/ieee1394/dma.h
>> as I described in the mail of yesterday.
>
>
> Huh? Are you sure that Ubuntu doesn't have a symbolic link at /lib/modules/2.6.28-19-generic/build pointing
> to /usr/src/linux-headers-2.6.28-19-generic/?
>
> If it doesn't have, then all compat checks done by make_config_compat.pl would fail.
>
>> Now, I realize that the header files could ALSO be present in the build directory, so there should be a check on that as well, as otherwise the FIREDTV is incorrectly disabled on other distros, or source builds.
>>
>> Yes, and I know all of this is ugly ....
>
> It is not just ugly. It will break compilation on Ubuntu with:
> 	$ make release DIR=<some dir>
>
> Cheers,
> Mauro
>


-- 
Jan Hoogenraad
Hoogenraad Interface Services
Postbus 2717
3500 GS Utrecht