diff options
Diffstat (limited to 'v4l/scripts/make_kconfig.pl')
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 771efa63d..e34a26f17 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -26,10 +26,6 @@ sub process_config ($) open $in,"$kernel/include/$filename" or die "File not found: $kernel/include/$filename"; while (<$in>) { - if (m|\#include\s+\<(.*)\>|) { - process_config ($1); - next; - } if (m/\#define\s+CONFIG_([^ ]*)_ON_SMP\s+(.*)\n/) { my $key=$1; my $value=$2; @@ -229,10 +225,10 @@ sub open_kconfig($$) { open_kconfig($dir,"$dir/$1"); next; } - if (m|^\s+depends on\s+(.*)\n|) { + if (m|^\s+depends on\s+(.+?)\s*$|) { check_deps ($key,$1); } - if (m|^\s+select\s+(.*)\n|) { + if (m|^\s+select\s+(.+?)\s*(if .*?)?\s*$|) { check_deps ($key,$1); } if (m|^\s+bool(ean)?\s|) { @@ -333,7 +329,7 @@ sub cmp_ver($$) return $v1_sublevel <=> $v2_sublevel; } -process_config("linux/config.h"); +process_config("linux/autoconf.h"); parse_versions; @@ -402,13 +398,14 @@ close OUT; # These options should default to off disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); +disable_config('DVB_FE_CUSTOMISE'); # Hack for check sound/oss/aci.h header my $mirodep="$kernel/sound/oss/aci.h"; -if (!open IN, $mirodep) { +if (! -e $mirodep) { my $key="RADIO_MIROPCM20"; -print <<"EOF2"; + print <<"EOF2"; $key: $mirodep is missing. ***WARNING:*** You do not have the full kernel sources installed. @@ -431,7 +428,6 @@ Please see your distro's web site for instructions to build a new kernel. EOF2 $kernopts{$key}='n'; } -close IN; # Recursively check for broken dependencies my $i; |