From 1513c16af8fe4dd3f0afa6548cb39331c24bd01d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 26 Mar 2006 08:53:06 -0300 Subject: Some cleanups at make xconfig From: Mauro Carvalho Chehab Now, it doesn't depend on kernel Kconfig stuff: - It generates a Kconfig.kern based on unsolved dependencies. - It assumes that all needed dependencies were compiled as module. Only Multimedia tree is showed to the user. To work, user should have runned xconfig before at the normal kernel tree. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 67 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 12 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index f612e83db..91c37693f 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -1,37 +1,80 @@ #!/usr/bin/perl use FileHandle; -my $KDIR=shift; my $ARCH=shift; +my %depend = (); +my %config = (); + +sub add_config($) +{ + my $arg=shift; + + if ($arg =~ m/^([A-Z0-9_]+)/) { + $config{$1} = 1; + } +} + +sub check_deps($) +{ + my $arg=shift; + $arg=$arg." "; + + while ($arg ne "") { + if ($arg =~ m/^([A-Z0-9_]+) /) { + my $val=$1; + my $prev=$depend{$val}; + $depend { $val } = 1+$prev; + } + $arg =~ s/^[^ ]+ //; + } +} + sub open_kconfig($$) { my ($dir,$file)=@_; my $in = new FileHandle; -print "opening $file\n"; +#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\"]+drivers/media/(video|dvb)/Kconfig;) { +# next; +# } if (m|^\s*source[\s\"]+([^\n\s\"]+)[\n\s\"]|) { open_kconfig($dir,"$dir/$1"); next; } + if (m|^\s+depends on (.*)\n|) { + check_deps ($1); + } + if (m|^\s+select (.*)\n|) { + check_deps ($1); + } + if (m|^\s*config (.*)\n|) { + add_config ($1); + } + 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"; +open_kconfig ("../linux","../linux/drivers/media/Kconfig"); + close OUT; + +while ( my ($key, $value) = each(%config) ) { + delete $depend{$key}; +} + +open OUT,">Kconfig.kern"; +while ( my ($key, $value) = each(%depend) ) { + print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n"; +} +close OUT; + -- cgit v1.2.3 From d90bd3ff0cbd895065afc24bb83501e97c844cd0 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 7 Apr 2006 19:05:42 -0300 Subject: Big changes at v4l-dvb make internal working From: Mauro Carvalho Chehab Previously, tree building were based on Make.config. This file contained all compiling stuff. Also, v4l/Makefile contained all drivers that should be copiled, replicating the rules of all other Makefiles under linux. Now, make will rely on linux/*/Makefile to compile the modules. This approach allows usage of Kconfig files, allowing partial compilations. Newer makefile commands introduced: make allmodconfig - Selects all stuff to be compiled as module; make config - Selects packages via text interface; make xconfig - Selects packages via qt interface; make gconfig - selects packages via gtk interface. for config, xconfig and gconfig to be used, those scripts needs to be previously compiled at kernel. So, user needs to use those commands previously at kernel tree. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 73 +++++++++++++++++++++++++++-- v4l/scripts/make_makefile.pl | 109 +++++++++++++++++++++++++++++++++++++++++++ v4l/scripts/make_noconfig.pl | 60 ++++++++++++++++++++++++ 3 files changed, 239 insertions(+), 3 deletions(-) create mode 100644 v4l/scripts/make_makefile.pl create mode 100644 v4l/scripts/make_noconfig.pl (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 91c37693f..b1d6f5d53 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -1,10 +1,10 @@ #!/usr/bin/perl use FileHandle; -my $ARCH=shift; - my %depend = (); +my %minver = (); my %config = (); +my $version, $level, $sublevel; sub add_config($) { @@ -33,6 +33,7 @@ sub check_deps($) sub open_kconfig($$) { my ($dir,$file)=@_; my $in = new FileHandle; + my $skip=0; #print "opening $file\n"; open $in,"$file"; @@ -51,15 +52,78 @@ sub open_kconfig($$) { check_deps ($1); } if (m|^\s*config (.*)\n|) { + my $key=$1; + add_config ($1); + + my $min=$minver { $key }; + my $minversion, $minlevel, $minsublevel; + if ($min =~ m/(\d+)\.(\d+)\.(\d+)/) { + $minversion=$1; + $minlevel=$2; + $minsublevel=$3; + } else { + die "Minimum version for $key not found at versions.txt"; + } + if ( ($version < $minversion) | + ($level < $minlevel) | + ($sublevel < $minsublevel) ) { + $skip=1; + printf "$key requires version $minversion.$minlevel.$minsublevel\n"; + + print OUT "# $key disabled due to incorrect version\nconfig $key\n\ttristate\n\tdefault n\n\n"; + next; + } else { +# printf "OK: $key requires version $minversion.$minlevel.$minsublevel\n"; + $skip=0; + } } s/^main(menu\s\"[^\"]+)/\1 - DON'T CHANGE IT!/; - print OUT $_; + if (m/^[\w]/) { + $skip=0; + } + if (!$skip) { + print OUT $_; + } + } + close $in; +} + +sub parse_versions () +{ + my $in = new FileHandle; + my $ver; + + open $in,"versions.txt"; + while (<$in>) { + if (m/\[([\d.]*)\]/) { + $ver=$1; + next; + } + s/\n//; + if (m/^\s*([\w\d_]+)/) { + $minver { $1 } = $ver; +# printf ("%s=%s\n",$1,$ver); + } } close $in; } +parse_versions; + +open IN,".version"; +while () { + if (m/KERNELRELEASE\s*[:]*[=]+\s*(\d+)\.(\d+)\.(\d+)/) { + $version=$1; + $level=$2; + $sublevel=$3; + } +} +close IN; + +printf "Preparing to compile for kernel version %d.%d.%d\n",$version,$level,$sublevel; + open OUT,">Kconfig"; print OUT "mainmenu \"V4L/DVB menu\"\n"; @@ -73,6 +137,9 @@ while ( my ($key, $value) = each(%config) ) { } open OUT,">Kconfig.kern"; + +print OUT "config MODULES\n\tboolean\n\tdefault y\n\n"; + while ( my ($key, $value) = each(%depend) ) { print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n"; } diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl new file mode 100644 index 000000000..135b8bdb1 --- /dev/null +++ b/v4l/scripts/make_makefile.pl @@ -0,0 +1,109 @@ +#!/usr/bin/perl +use FileHandle; + +sub check_line($$$) +{ + my $dir=shift; + my $obj=shift; + my $arg=shift; + my $arg2=""; + + $arg=$arg." "; + + while ($arg ne "") { + if ($arg =~ m|^([^ /]+)/ |) { + my $newdir=$1; +# print "include $dir/$newdir/Makefile\n"; + open_makefile("$dir/$newdir/Makefile"); + $arg =~ s/^[^ ]+ //; + } else { + $arg =~ s/^([^ ]+ )//; + $arg2 = $arg2.$1; + } + } + $arg2 =~ s/\s+$//; + if ($arg2 ne "") { +# print "arg=$arg2\n"; + print OUT "$obj$arg2\n"; + } +} + +sub remove_includes($$) +{ + my $obj=shift; + my $arg=shift; + my $arg2=""; + + $arg=$arg." "; + + while ($arg ne "") { + if (!$arg =~ m|^(-I\s*[^ ]+) |) { + $arg2 = $arg2.$1; + $arg =~ s|^[^ ] ||; + } else { + $arg =~ s|^(-I\s*[^ ]+) ||; + } + } + if ($arg2 ne "") { + print OUT "$obj$arg2\n"; + } +} + +sub open_makefile($) { + my $file= shift; + my $in = new FileHandle; + my $dir= ""; + my $count=0; + + $file=~ m|^(.*)/[^/]*$|; + $dir=$1; + +#print "opening $file (dir=$dir)\n"; + open $in,"$file"; + + while (<$in>) { + if (m|\s*#|) { + print OUT $_; + next; + } + if (m|^\s*include|) { + next; + } + if (count==1 || m|(^\s*EXTRA_CFLAGS.*=\s*)(.*/.*)\n|) { + remove_includes($1,$2); + if (m|[\\]\n|) { + $count=1; + } else { + $count=0; + } + next; + } +# if (m|(^\s*obj.*=\s*)(.*/.*)\n|) { + if (count==2 || m|(^\s*obj.*=\s*)(.*)\n|) { + check_line($dir,$1,$2); + if (m|\\\n|) { + $count=1; + } else { + $count=0; + } + next; + } + print OUT $_; + } + close $in; +} + +open OUT,">Makefile.media"; +open_makefile ("../linux/drivers/media/Makefile"); +close OUT; + +while ( my ($key, $value) = each(%config) ) { + delete $depend{$key}; +} + +open OUT,">Kconfig.kern"; +while ( my ($key, $value) = each(%depend) ) { + print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n"; +} +close OUT; + diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl new file mode 100644 index 000000000..503653a4f --- /dev/null +++ b/v4l/scripts/make_noconfig.pl @@ -0,0 +1,60 @@ +#!/usr/bin/perl + +my $config = (); + +open IN,".config"; +while () { + if (m/\s*([\d\w_]+)[=](.*)\n/) { +#printf "%s=%s\n",$1,$2; + $config { $1 } = $2; + } +} +close IN; + +open IN,".version"; +while () { + if (m/KERNELRELEASE\s*[:]*[=]+\s*(\d+)\.(\d+)\.(\d+)/) { + $version=$1; + $level=$2; + $sublevel=$3; + } +} +close IN; + +open IN,"versions.txt"; +while () { + if (m/\[(\d+)\.(\d+)\.(\d+)\]/) { + $minversion=$1; + $minlevel=$2; + $minsublevel=$3; + next; + } + s/\n//; + + if (m/DVB_AV7110_FIRMWARE/) { + next; + } + if (m/DVB_AV7110_FIRMWARE_FILE/) { + next; + } + if (m/^\s*([\w\d_]+)/) { + if ( ($version < $minversion) | + ($level < $minlevel) | + ($sublevel < $minsublevel) ) { + $config { "CONFIG_$1" } = 'n'; +#print "CONFIG_$1 version is not supported\n"; + next; + } + if (!($config { "CONFIG_$1" } ) ) { +print "CONFIG_$1 is unset\n"; + $config { "CONFIG_$1" } = 'n'; + } + } +} +close IN; + +open OUT,">.myconfig"; +while ( my ($key, $value) = each(%config) ) { + printf OUT "%-44s := %s\n",$key,$value; +} +close OUT; -- cgit v1.2.3 From 8e830d2f4fd6b430ec05e6dd6ec98d32aa2d0fc6 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 7 Apr 2006 19:10:14 -0300 Subject: Now, make all will replicate old behavior From: Mauro Carvalho Chehab make all will do allmodconfig before compiling Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 0 v4l/scripts/make_noconfig.pl | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 v4l/scripts/make_makefile.pl mode change 100644 => 100755 v4l/scripts/make_noconfig.pl (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl old mode 100644 new mode 100755 diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl old mode 100644 new mode 100755 -- cgit v1.2.3 From 05b97b078973c39870f58b53238dca456d2b43d7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 8 Apr 2006 11:01:58 -0300 Subject: Fix make install From: Mauro Carvalho Chehab Previous patch broke make install. This patch fix it. Also, serveral cleanups were made at core Makefile. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 135b8bdb1..48552c425 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -1,6 +1,8 @@ #!/usr/bin/perl use FileHandle; +my $instdir = (); + sub check_line($$$) { my $dir=shift; @@ -8,6 +10,10 @@ sub check_line($$$) my $arg=shift; my $arg2=""; + my $idir = $dir; + + $idir =~ s|^../linux/drivers/media/||; + $arg=$arg." "; while ($arg ne "") { @@ -18,7 +24,15 @@ sub check_line($$$) $arg =~ s/^[^ ]+ //; } else { $arg =~ s/^([^ ]+ )//; - $arg2 = $arg2.$1; + my $cur=$1; + $arg2 = $arg2.$cur; + $cur =~ s/\s+$//; + $cur =~ s/\\$//; + $cur =~ s/\s+$//; + $cur =~ s/\.o$/.ko/; + if ( ($cur ne "") && (! ($instdir { $idir } =~ m/($cur) /))) { + $instdir { $idir } = $instdir { $idir }.$cur." "; + } } } $arg2 =~ s/\s+$//; @@ -95,10 +109,32 @@ sub open_makefile($) { open OUT,">Makefile.media"; open_makefile ("../linux/drivers/media/Makefile"); + +# Creating Install rule +printf OUT "install::\n"; +printf OUT "\t@strip --strip-debug \$(inst-m)\n\n"; + +while ( my ($key, $value) = each(%instdir) ) { + printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\\n\"\n"; + printf OUT "\t-install -d \$(KDIR26)/$key\n"; + printf OUT "\t-install -m 644 -c $value \$(KDIR26)/$key\n\n"; +} + +# Creating Remove rule +printf OUT "remove::\n"; +printf OUT "\t\@echo -e \"\\nRemoving old \$(DEST) files\\n\"\n"; +printf OUT "\t-rm -r \$(DEST)\n\n"; + +while ( my ($key, $value) = each(%instdir) ) { + printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files\\n\"\n"; + printf OUT "\tcd \$(KDIR26)/$key\n"; + printf OUT "\t-rm $value\n\n"; +} + close OUT; while ( my ($key, $value) = each(%config) ) { - delete $depend{$key}; + delete $depend{$key}; } open OUT,">Kconfig.kern"; @@ -106,4 +142,3 @@ while ( my ($key, $value) = each(%depend) ) { print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n"; } close OUT; - -- cgit v1.2.3 From b664cece1c397677d509fa9a41874464f5a44214 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 8 Apr 2006 11:47:00 -0300 Subject: Some cleanups at make install From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 48552c425..1063617a1 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -26,10 +26,12 @@ sub check_line($$$) $arg =~ s/^([^ ]+ )//; my $cur=$1; $arg2 = $arg2.$cur; + $cur =~ s/\s+$//; $cur =~ s/\\$//; $cur =~ s/\s+$//; $cur =~ s/\.o$/.ko/; + if ( ($cur ne "") && (! ($instdir { $idir } =~ m/($cur) /))) { $instdir { $idir } = $instdir { $idir }.$cur." "; } @@ -115,9 +117,11 @@ printf OUT "install::\n"; printf OUT "\t@strip --strip-debug \$(inst-m)\n\n"; while ( my ($key, $value) = each(%instdir) ) { - printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\\n\"\n"; + printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\"\n"; printf OUT "\t-install -d \$(KDIR26)/$key\n"; - printf OUT "\t-install -m 644 -c $value \$(KDIR26)/$key\n\n"; + + printf OUT "\t\@files='$value'; "; + printf OUT "for i in \$\$files; do install -m 644 -c \$\$i \$(KDIR26)/$key; done\n\n"; } # Creating Remove rule @@ -127,8 +131,8 @@ printf OUT "\t-rm -r \$(DEST)\n\n"; while ( my ($key, $value) = each(%instdir) ) { printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files\\n\"\n"; - printf OUT "\tcd \$(KDIR26)/$key\n"; - printf OUT "\t-rm $value\n\n"; + printf OUT "\t\@files='$value'; "; + printf OUT "for i in \$\$files; do rm \$(KDIR26)/$key/\$\$i; done\n\n"; } close OUT; -- cgit v1.2.3 From f5a63349b2b9e0daf5c7a993792af521e3dda46f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 8 Apr 2006 16:05:48 -0300 Subject: Some cleanups at make install/make remove From: Mauro Carvalho Chehab Now, it won't generate errors for non-compiled objects. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 1063617a1..17ef048e7 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -114,25 +114,32 @@ open_makefile ("../linux/drivers/media/Makefile"); # Creating Install rule printf OUT "install::\n"; -printf OUT "\t@strip --strip-debug \$(inst-m)\n\n"; +#printf OUT "\t@strip --strip-debug \$(inst-m)\n\n"; while ( my ($key, $value) = each(%instdir) ) { - printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\"\n"; - printf OUT "\t-install -d \$(KDIR26)/$key\n"; + printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files:\"\n"; + printf OUT "\t\@install -d \$(KDIR26)/$key\n"; printf OUT "\t\@files='$value'; "; - printf OUT "for i in \$\$files; do install -m 644 -c \$\$i \$(KDIR26)/$key; done\n\n"; + printf OUT "for i in \$\$files;do if [ -e \$\$i ]; then echo -n \"\$\$i \";"; + printf OUT " install -m 644 -c \$\$i \$(KDIR26)/$key; fi; done; echo;\n\n"; } # Creating Remove rule -printf OUT "remove::\n"; +printf OUT "remove rminstall::\n"; printf OUT "\t\@echo -e \"\\nRemoving old \$(DEST) files\\n\"\n"; -printf OUT "\t-rm -r \$(DEST)\n\n"; while ( my ($key, $value) = each(%instdir) ) { - printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files\\n\"\n"; + printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files:\"\n"; printf OUT "\t\@files='$value'; "; - printf OUT "for i in \$\$files; do rm \$(KDIR26)/$key/\$\$i; done\n\n"; + + printf OUT "for i in \$\$files;do if [ -e \$(KDIR26)/$key/\$\$i ]; then "; + printf OUT "echo -n \"\$\$i \";"; + printf OUT " rm \$(KDIR26)/$key/\$\$i; fi; done; "; + + printf OUT "for i in \$\$files;do if [ -e \$(KDIR26)/$key/\$\$i.gz ]; then "; + printf OUT "echo -n \"\$\$i.gz \";"; + printf OUT " rm \$(KDIR26)/$key/\$\$i.gz; fi; done; echo;\n\n"; } close OUT; -- cgit v1.2.3 From 8e43b1719bccf0441257cd803e36d75e34e55d9f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 9 Apr 2006 13:02:02 -0300 Subject: If .myconfig is not found, make will do allmodconfig. From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 17ef048e7..116df3394 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -153,3 +153,11 @@ while ( my ($key, $value) = each(%depend) ) { print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n"; } close OUT; + +if (open OUT,".myconfig") { + close IN; +} else { + system "make allmodconfig"; +} + + -- cgit v1.2.3 From 6f35eb920300b903a0078d2ca191d1ea9cd7a15f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 9 Apr 2006 19:05:36 -0300 Subject: Newer drivers now compile fine with 2.6.14 kernel. From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_noconfig.pl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl index 503653a4f..a47ca4acf 100755 --- a/v4l/scripts/make_noconfig.pl +++ b/v4l/scripts/make_noconfig.pl @@ -55,6 +55,9 @@ close IN; open OUT,">.myconfig"; while ( my ($key, $value) = each(%config) ) { + if ($value eq "y") { + $value="m"; + } printf OUT "%-44s := %s\n",$key,$value; } close OUT; -- cgit v1.2.3 From 91263e7de241ee6403c43cd3a13206f749798ba6 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 13 Apr 2006 18:50:22 -0300 Subject: Added missing depmod after the end of installation process From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 116df3394..8371f6a4a 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -124,6 +124,7 @@ while ( my ($key, $value) = each(%instdir) ) { printf OUT "for i in \$\$files;do if [ -e \$\$i ]; then echo -n \"\$\$i \";"; printf OUT " install -m 644 -c \$\$i \$(KDIR26)/$key; fi; done; echo;\n\n"; } +printf OUT "\t/sbin/depmod -a \${KERNELRELEASE}\n\n"; # Creating Remove rule printf OUT "remove rminstall::\n"; -- cgit v1.2.3 From 7fcf69dab28d0e73c9c2bb5744b884001faddb09 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Sat, 15 Apr 2006 16:26:44 +0200 Subject: make_noconfig.pl fixed for CONFIG_DVB_AV7110_OSD and CONFIG_DVB_AV7110_FIRMWARE From: Oliver Endriss Without this fix, CONFIG_DVB_AV7110_OSD=y and CONFIG_DVB_AV7110_FIRMWARE=y were ignored in v4l/Makefile because make_noconfig.pl set them to "CONFIG_DVB_AV7110_... = m". Signed-off-by: Oliver Endriss --- v4l/scripts/make_noconfig.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl index a47ca4acf..94f80a954 100755 --- a/v4l/scripts/make_noconfig.pl +++ b/v4l/scripts/make_noconfig.pl @@ -55,7 +55,9 @@ close IN; open OUT,">.myconfig"; while ( my ($key, $value) = each(%config) ) { - if ($value eq "y") { + if ($key ne CONFIG_DVB_AV7110_OSD && + $key ne CONFIG_DVB_AV7110_FIRMWARE && + $value eq "y") { $value="m"; } printf OUT "%-44s := %s\n",$key,$value; -- cgit v1.2.3 From 6a6a2d0070d94c04bdb2961a143fd516753464f0 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 25 Apr 2006 18:20:44 -0300 Subject: Improves V4L/DVB in-tree building From: Mauro Carvalho Chehab Now, make_kconfig.sh will check for boolean/tristate config vars and handle it properly. Also, make allyesconfig/allmodconfig will use make_kconfig.sh to generate .myconfig instead of conf -m. This way, make all will not require priviledges at kernel tree. write access to kernel tree is still required for make menuconfig/ make xconfig/make qconfig. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 46 ++++++++++++++++++++++++++++++++++++++++++-- v4l/scripts/make_noconfig.pl | 5 ----- 2 files changed, 44 insertions(+), 7 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index b1d6f5d53..11392c32d 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -4,8 +4,27 @@ use FileHandle; my %depend = (); my %minver = (); my %config = (); +my %tristate = (); my $version, $level, $sublevel; +my $force_kconfig=shift; + +sub add_bool($) +{ + my $arg=shift; + + $tristate{$arg}="bool"; + printf "Boolean:%s\n",$arg; +} + +sub add_tristate($) +{ + my $arg=shift; + + $tristate{$arg}="tristate"; + printf "Tristate:%s\n",$arg; +} + sub add_config($) { my $arg=shift; @@ -34,6 +53,7 @@ sub open_kconfig($$) { my ($dir,$file)=@_; my $in = new FileHandle; my $skip=0; + my $key; #print "opening $file\n"; open $in,"$file"; @@ -51,9 +71,14 @@ sub open_kconfig($$) { if (m|^\s+select (.*)\n|) { check_deps ($1); } + if (m|^\s*bool\s+|) { + add_bool($key); + } + if (m|^\s*tristate\s+|) { + add_tristate($key); + } if (m|^\s*config (.*)\n|) { - my $key=$1; - + $key=$1; add_config ($1); my $min=$minver { $key }; @@ -139,9 +164,26 @@ while ( my ($key, $value) = each(%config) ) { open OUT,">Kconfig.kern"; print OUT "config MODULES\n\tboolean\n\tdefault y\n\n"; +$tristate{"MODULES"}="bool"; while ( my ($key, $value) = each(%depend) ) { print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n"; } close OUT; +if (($force_kconfig eq 1) || !open IN,".config") { + open OUT,">.config"; + while ( my ($key,$value) = each(%tristate) ) { + + if ($key eq "DVB_AV7110_FIRMWARE") { + printf OUT "CONFIG_%s=n\n",$key; + } else { + if ($value eq "tristate") { + printf OUT "CONFIG_%s=m\n",$key; + } else { + printf OUT "CONFIG_%s=y\n",$key; + } + } + } + close OUT; +} diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl index 94f80a954..503653a4f 100755 --- a/v4l/scripts/make_noconfig.pl +++ b/v4l/scripts/make_noconfig.pl @@ -55,11 +55,6 @@ close IN; open OUT,">.myconfig"; while ( my ($key, $value) = each(%config) ) { - if ($key ne CONFIG_DVB_AV7110_OSD && - $key ne CONFIG_DVB_AV7110_FIRMWARE && - $value eq "y") { - $value="m"; - } printf OUT "%-44s := %s\n",$key,$value; } close OUT; -- cgit v1.2.3 From 50833699bf64e0d5966fb7fa4142fe7ee189fe8f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 26 Apr 2006 18:08:40 -0300 Subject: Re-inserting strip at install rule From: Mauro Carvalho Chehab strip is responsible to remove all debug info from kernel object files. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 8371f6a4a..6b8076a4d 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -114,7 +114,8 @@ open_makefile ("../linux/drivers/media/Makefile"); # Creating Install rule printf OUT "install::\n"; -#printf OUT "\t@strip --strip-debug \$(inst-m)\n\n"; +printf OUT "\t\@echo \"Stripping debug info from files:\"\n"; +printf OUT "\t\@strip --strip-debug \$(inst-m)\n\n"; while ( my ($key, $value) = each(%instdir) ) { printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files:\"\n"; @@ -160,5 +161,3 @@ if (open OUT,".myconfig") { } else { system "make allmodconfig"; } - - -- cgit v1.2.3 From 1c45b6c1b050a3aa3207fb61e6b7628db01e8b7c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 26 Apr 2006 19:27:34 -0300 Subject: Some vars were not initializated by the script. fixed. From: Mauro Carvalho Chehab This avoids warnings when running make *config Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 11392c32d..1d1155af4 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -14,7 +14,7 @@ sub add_bool($) my $arg=shift; $tristate{$arg}="bool"; - printf "Boolean:%s\n",$arg; +# printf "Boolean:%s\n",$arg; } sub add_tristate($) @@ -22,7 +22,7 @@ sub add_tristate($) my $arg=shift; $tristate{$arg}="tristate"; - printf "Tristate:%s\n",$arg; +# printf "Tristate:%s\n",$arg; } sub add_config($) @@ -154,7 +154,6 @@ print OUT "mainmenu \"V4L/DVB menu\"\n"; print OUT "source Kconfig.kern\n"; open_kconfig ("../linux","../linux/drivers/media/Kconfig"); - close OUT; while ( my ($key, $value) = each(%config) ) { @@ -173,10 +172,14 @@ close OUT; if (($force_kconfig eq 1) || !open IN,".config") { open OUT,">.config"; + while ( my ($key, $value) = each(%depend) ) { + printf "CONFIG_%s=m\n",$key; + printf OUT "CONFIG_%s=m\n",$key; + } while ( my ($key,$value) = each(%tristate) ) { if ($key eq "DVB_AV7110_FIRMWARE") { - printf OUT "CONFIG_%s=n\n",$key; +# printf OUT "CONFIG_%s=n\n",$key; } else { if ($value eq "tristate") { printf OUT "CONFIG_%s=m\n",$key; -- cgit v1.2.3 From 366fa98a817c19558aaa09755a2ce12931a35f3d Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 27 Apr 2006 09:30:20 -0400 Subject: move install / rminstall invocation rules to v4l/Makefile From: Michael Krufky This patch moves the 'make install' and 'make rminstall' rules into the central Makefile. This allows for us to assign dependencies to these rules, so that modules built as a reult of a tree-merge don't have to be installed separately. Now, instead of doing 'make install && make ivtv-install', the simple command, 'make install' will call the sub-install rules and take care of the entire task. Signed-off-by: Michael Krufky --- v4l/scripts/make_makefile.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 6b8076a4d..238c5082f 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -113,7 +113,7 @@ open OUT,">Makefile.media"; open_makefile ("../linux/drivers/media/Makefile"); # Creating Install rule -printf OUT "install::\n"; +printf OUT "media-install::\n"; printf OUT "\t\@echo \"Stripping debug info from files:\"\n"; printf OUT "\t\@strip --strip-debug \$(inst-m)\n\n"; @@ -128,7 +128,7 @@ while ( my ($key, $value) = each(%instdir) ) { printf OUT "\t/sbin/depmod -a \${KERNELRELEASE}\n\n"; # Creating Remove rule -printf OUT "remove rminstall::\n"; +printf OUT "media-rminstall::\n"; printf OUT "\t\@echo -e \"\\nRemoving old \$(DEST) files\\n\"\n"; while ( my ($key, $value) = each(%instdir) ) { -- cgit v1.2.3 From dc9f8439dc12eaa1f581a7908ea154dffb7c1e29 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 27 Apr 2006 18:34:03 -0300 Subject: Compilation for DVB_AV7110_FIRMWARE seems to be weird From: Mauro Carvalho Chehab Some systems use a previous config information to generate a default config. This seems to cause troubles on some systems. This patch fixes compilation for AV7110 firmware inside V4L/DVB tree. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 2 +- v4l/scripts/make_noconfig.pl | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 1d1155af4..aebf2a950 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -179,7 +179,7 @@ if (($force_kconfig eq 1) || !open IN,".config") { while ( my ($key,$value) = each(%tristate) ) { if ($key eq "DVB_AV7110_FIRMWARE") { -# printf OUT "CONFIG_%s=n\n",$key; + printf OUT "CONFIG_%s=n\n",$key; } else { if ($value eq "tristate") { printf OUT "CONFIG_%s=m\n",$key; diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl index 503653a4f..a81e157e2 100755 --- a/v4l/scripts/make_noconfig.pl +++ b/v4l/scripts/make_noconfig.pl @@ -31,9 +31,6 @@ while () { } s/\n//; - if (m/DVB_AV7110_FIRMWARE/) { - next; - } if (m/DVB_AV7110_FIRMWARE_FILE/) { next; } -- cgit v1.2.3 From 91a3da5165321c89bb4a35937d47f19ac53f8899 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 2 May 2006 09:29:34 -0300 Subject: Fix checking logic for a broken xawtv version From: Mauro Carvalho Chehab moved from if to ifndef. Also added such tests at gentree script. Gentree updated to its latest version. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/gentree.pl | 77 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 27 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index 0ae296b93..de91722a7 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -2,12 +2,10 @@ use strict; use File::Find; use Fcntl ':mode'; -use Cwd; my $VER = shift; my $SRC = shift; my $DESTDIR = shift; -my $cwd; my $extra; @@ -70,9 +68,9 @@ sub filter_source ($$) { if ($line =~ m/^#include \"compat.h\"/) { next; } - if ($line =~ m/[\$]Id:/) { - next; - } +# if ($line =~ m/[\$]Id:/) { +# next; +# } if ($line =~ /^#ifdef MM_KERNEL/) { chomp($line); $state{$level} = "if"; @@ -81,8 +79,12 @@ sub filter_source ($$) { $level++; next; } - if ($line =~ /^\s*#if 0\s.*[Kk][Ee][Ee][Pp].*/) { - print OUT "#if 0\n"; + if ($line =~ m|^\s*\#if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) { + if ($1 eq ";") { + print OUT "#if 0\n"; + } else { + print OUT "#if 0$1\n"; + } chomp($line); $state{$level} = "ifother"; $if{$level} = 0; @@ -90,6 +92,30 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifdef\sSTV0297_CS2/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 0; + print STDERR "/* BP #if 0 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } + if ($line =~ /^#ifndef\sBROKEN_XAWTV/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 0 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } + if ($line =~ /^#ifndef\sSTV0297_CS2/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#if 0/) { chomp($line); $state{$level} = "if"; @@ -98,8 +124,8 @@ sub filter_source ($$) { $level++; next; } - if ($line =~ /^#if 1\s.*[Kk][Ee][Ee][Pp].*/) { - print OUT "#if 1\n"; + if ($line =~ m|^\s*\#if\s+1\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) { + print OUT "#if 1$1\n"; $state{$level} = "ifother"; $if{$level} = 1; print STDERR "/* BP #if 1 (keep) state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; @@ -122,15 +148,15 @@ sub filter_source ($$) { $level++; next; } - if ($line =~ /^#if.*I2C_CLASS_TV_ANALOG/) { + if ($line =~ /^#if.*CONFIG_XC3028/) { chomp($line); $state{$level} = "if"; - $if{$level} = 1; + $if{$level} = 0; print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; $level++; next; } - if ($line =~ /^#ifndef.\s*I2C_DF_DUMMY/) { + if ($line =~ /^#if.*I2C_CLASS_TV_ANALOG/) { chomp($line); $state{$level} = "if"; $if{$level} = 1; @@ -138,22 +164,22 @@ sub filter_source ($$) { $level++; next; } - if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) { + if ($line =~ /^#ifndef.\s*I2C_PEC/) { chomp($line); $state{$level} = "if"; - $if{$level} = 1; + $if{$level} = 0; print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; $level++; next; } - if ($line =~ /^#if.*CONFIG_XC3028/) { + if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) { chomp($line); $state{$level} = "if"; - $if{$level} = 0; - print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level$ + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; $level++; next; - } + } if ($line =~ /^#if.*BTTV_VERSION_CODE/) { chomp($line); $line =~ s@^#if\s*@@; @@ -280,9 +306,7 @@ sub parse_dir { return; } - my $mode = (lstat("$cwd/$file"))[2]; - -# printf "Permissions of %s/%s are %04o (dir=%s\n", $cwd,$file, $mode, cwd; + my $mode = (lstat("$file"))[2]; if ($mode & S_IFDIR) { return; @@ -291,14 +315,14 @@ sub parse_dir { $srcdir =~ s/(.)/\[$1\]/g; my $f2 = $file; - $f2 =~ s,^$srcdir,$cwd/$DESTDIR/,; + $f2 =~ s,^$srcdir,$DESTDIR/,; print "from $file to $f2\n"; my $tmp = "/tmp/src.$$"; if ($file =~ m/.*\.[ch]$/) { - filter_source("$cwd/$file","$tmp"); + filter_source("$file","$tmp"); } else { - system("cp $cwd/$file $tmp"); + system("cp $file $tmp"); } my $dir = $f2; @@ -315,12 +339,11 @@ sub parse_dir { my $patchtmploc = "/tmp/temp.patch"; -printf STDERR < Date: Sun, 7 May 2006 18:29:49 -0400 Subject: fix ability to pass compile-time build options when building from the hg repo From: Michael Krufky When building in-kernel, compile-time build options are passed into the compiler using '#include ' . This file #include's , which is created on the fly by the kbuild system. However, this does not work correctly when building from the mercurial repository, since the kernel is built indepentently of v4l/.myconfig This creates a "config-compat.h", which will be #include'd by compat.h and will emulate for the local build. Signed-off-by: Michael Krufky --- v4l/scripts/makelinks.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index a66989771..03fd48849 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -39,10 +39,12 @@ done for x in `find include -type d | grep -v CVS` ; do ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h + touch $1/$x/config-compat.h done for x in `find drivers/media -type d | grep -v CVS` ; do ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h + touch $1/$x/config-compat.h done cd .. -- cgit v1.2.3 From acbc613601ba93f26adb3ba1d91aabeff718298b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 17 May 2006 15:43:51 -0300 Subject: Fix compilation for Miropcm20 and Cinergy From: Mauro Carvalho Chehab Miropcm compilation were assuming to compile under linux/drivers/media/video, but this is not true when compiling in-tree. Also, make allyesconfig were making "y" to an advanced configuration for Cinergy. gentree.pl also updated. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/gentree.pl | 24 ++++++++++++++++++++++++ v4l/scripts/make_kconfig.pl | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index de91722a7..e58d410c2 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -79,6 +79,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifdef _COMPAT_H/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 0; + print STDERR "/* BP #if MM_KERNEL state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ m|^\s*\#if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) { if ($1 eq ";") { print OUT "#if 0\n"; @@ -164,6 +172,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifndef.\s*I2C_DF_DUMMY/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#ifndef.\s*I2C_PEC/) { chomp($line); $state{$level} = "if"; @@ -172,6 +188,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifdef.\s*I2C_PEC/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) { chomp($line); $state{$level} = "if"; diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index aebf2a950..c4212d427 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -178,7 +178,8 @@ if (($force_kconfig eq 1) || !open IN,".config") { } while ( my ($key,$value) = each(%tristate) ) { - if ($key eq "DVB_AV7110_FIRMWARE") { + if ( ($key eq "DVB_AV7110_FIRMWARE") || + ($key eq "DVB_CINERGYT2_TUNING") ) { printf OUT "CONFIG_%s=n\n",$key; } else { if ($value eq "tristate") { -- cgit v1.2.3 From 122bd90fa6f72e1366146662e7fb9a6581aab68e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 17 May 2006 17:58:50 -0300 Subject: Removed a broken code inside make_kconfig From: Mauro Carvalho Chehab This code were not working, and were obsoleted by the while just bellow, that checks only for tristate and boolean parameters. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 4 ---- 1 file changed, 4 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index c4212d427..04430ccf2 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -172,10 +172,6 @@ close OUT; if (($force_kconfig eq 1) || !open IN,".config") { open OUT,">.config"; - while ( my ($key, $value) = each(%depend) ) { - printf "CONFIG_%s=m\n",$key; - printf OUT "CONFIG_%s=m\n",$key; - } while ( my ($key,$value) = each(%tristate) ) { if ( ($key eq "DVB_AV7110_FIRMWARE") || -- cgit v1.2.3