diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 2 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 16 | ||||
| -rwxr-xr-x | v4l/scripts/rmmod.pl | 32 |
3 files changed, 23 insertions, 27 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 63d3fe48a..3e9336a95 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -33,7 +33,7 @@ endif default:: config-compat.h Makefile.media links .version echo srcdir $(SRCDIR) $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - + ./scripts/rmmod.pl check ################################################# # Object specific rules diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index b65037edf..9b2a1600f 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; @@ -398,13 +394,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. @@ -427,7 +424,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; diff --git a/v4l/scripts/rmmod.pl b/v4l/scripts/rmmod.pl index 19a0a8c61..ade231707 100755 --- a/v4l/scripts/rmmod.pl +++ b/v4l/scripts/rmmod.pl @@ -173,22 +173,22 @@ if ($mode eq "load") { prepare_cmd; parse_loaded; rmmod; + } elsif ($mode eq "reload") { + prepare_cmd; + parse_loaded; + my @modlist2=@modlist; + rmmod; + @modlist=@modlist2; + insmod(0); + } elsif ($mode eq "debug") { + prepare_cmd; + parse_loaded; + insmod(1); + } elsif ($mode eq "check") { + prepare_cmd; + parse_loaded; } else { - if ($mode eq "reload") { - prepare_cmd; - parse_loaded; - my @modlist2=@modlist; - rmmod; - @modlist=@modlist2; - insmod(0); - } else { - if ($mode eq "debug") { - prepare_cmd; - parse_loaded; - insmod(1); - } else { - printf "Usage: $0 [load|unload|reload]\n"; - } - } + printf "Usage: $0 [load|unload|reload|debug|check]\n"; } } + |