From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764814AbZD3Sw5 (ORCPT ); Thu, 30 Apr 2009 14:52:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764271AbZD3SwV (ORCPT ); Thu, 30 Apr 2009 14:52:21 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:56264 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763217AbZD3SwT (ORCPT ); Thu, 30 Apr 2009 14:52:19 -0400 Message-Id: <20090430185217.661759804@goodmis.org> References: <20090430185022.122124349@goodmis.org> User-Agent: quilt/0.46-1 Date: Thu, 30 Apr 2009 14:50:23 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Theodore Tso , Arnaldo Carvalho de Melo , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg Subject: [PATCH 1/7] kconfig: streamline_config.pl do not stop with no depends Content-Disposition: inline; filename=0001-kconfig-streamline_config.pl-do-not-stop-with-no-de.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt If a config is 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 add 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. [ Impact: fix to enable configs that need to be selected ] 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; } -- 1.6.2.1 --