From patchwork Wed Aug 19 02:56:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 42499 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 n7J33KdB028143 for ; Wed, 19 Aug 2009 03:03:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752040AbZHSDAt (ORCPT ); Tue, 18 Aug 2009 23:00:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751942AbZHSDAs (ORCPT ); Tue, 18 Aug 2009 23:00:48 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:34923 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752000AbZHSDAl (ORCPT ); Tue, 18 Aug 2009 23:00:41 -0400 Received: from gandalf.stny.rr.com ([74.67.89.75]) by hrndva-omta04.mail.rr.com with ESMTP id <20090819030041043.PFZN25613@hrndva-omta04.mail.rr.com>; Wed, 19 Aug 2009 03:00:42 +0000 Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.69) (envelope-from ) id 1MdbPh-00024W-12; Tue, 18 Aug 2009 23:00:37 -0400 Message-Id: <20090819030036.847387453@goodmis.org> References: <20090819025634.987354707@goodmis.org> User-Agent: quilt/0.46-1 Date: Tue, 18 Aug 2009 22:56:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Linus Torvalds , Theodore Tso , Arjan van de Ven , Greg KH , "Luis R. Rodriguez" , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg , Jonathan Corbet , Alan Jenkins , Andi Kleen Subject: [PATCH 04/14] 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; }