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