From patchwork Fri Sep 11 19:58:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 46986 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8BK45iK008614 for ; Fri, 11 Sep 2009 20:04:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756337AbZIKUAm (ORCPT ); Fri, 11 Sep 2009 16:00:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756336AbZIKUAl (ORCPT ); Fri, 11 Sep 2009 16:00:41 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:65129 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755905AbZIKUAb (ORCPT ); Fri, 11 Sep 2009 16:00:31 -0400 Received: from gandalf.stny.rr.com ([74.67.89.75]) by hrndva-omta04.mail.rr.com with ESMTP id <20090911200034147.DBES24259@hrndva-omta04.mail.rr.com>; Fri, 11 Sep 2009 20:00:34 +0000 Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.69) (envelope-from ) id 1MmCIL-0005pc-PQ; Fri, 11 Sep 2009 16:00:33 -0400 Message-Id: <20090911200033.537674063@goodmis.org> References: <20090911195849.451244684@goodmis.org> User-Agent: quilt/0.46-1 Date: Fri, 11 Sep 2009 15:58:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Andrew Morton , Ingo Molnar , Thomas Gleixner , Theodore Tso , Arnaldo Carvalho de Melo , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg , Dick Streefland , Stephen Rothwell Subject: [PATCH 04/15] kconfig: streamline_config.pl do not stop with no depends Content-Disposition: inline; filename=0004-kconfig-streamline_config.pl-do-not-stop-with-no-dep.patch Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Steven Rostedt If a config does not have a prompt, it must be selected. streamline_config.pl keeps track of all configs that select other configs. If a config that does not have a prompt needs to be set to enable a current module, it will include all configs that select it. Note, streamline_config.pl does not enable modules that are not already enabled. It only keeps enabled those that were enabled and might be needed to compile the current modules. The code to find the selects of a config is after the code that adds the depends. But if a config needed selects but had no dependencies, it would not be set. Because the code would stop before getting to the select. Signed-off-by: Steven Rostedt --- scripts/kconfig/streamline_config.pl | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 79d8557..1774905 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -237,13 +237,11 @@ while ($repeat) { foreach my $config (keys %configs) { $config =~ s/^CONFIG_//; - if (!defined($depends{$config})) { - next; + if (defined($depends{$config})) { + # This config has dependencies. Make sure they are also included + parse_config_dep_select $depends{$config}; } - # This config has dependencies. Make sure they are also included - parse_config_dep_select $depends{$config}; - if (defined($prompt{$config}) || !defined($selects{$config})) { next; }