From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130429233050.006754828@goodmis.org> Date: Mon, 29 Apr 2013 19:30:02 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Linux Kbuild mailing list , , "Robert P. J. Day" Subject: [PATCH 2/2] localmodconfig: Process source kconfig files as they are found References: <20130429233000.662744610@goodmis.org> Content-Disposition: inline; filename=0002-localmodconfig-Process-source-kconfig-files-as-they-.patch Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="00GvhwF7k39YY" Sender: linux-kernel-owner@vger.kernel.org List-ID: --00GvhwF7k39YY Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable From: Steven Rostedt A bug was reported that caused localmodconfig to not keep all the dependencies of ATH9K. This was caused by the kconfig file: In drivers/net/wireless/ath/Kconfig: --- if ATH_CARDS config ATH_DEBUG bool "Atheros wireless debugging" ---help--- Say Y, if you want to debug atheros wireless drivers. Right now only ath9k makes use of this. source "drivers/net/wireless/ath/ath5k/Kconfig" source "drivers/net/wireless/ath/ath9k/Kconfig" source "drivers/net/wireless/ath/carl9170/Kconfig" source "drivers/net/wireless/ath/ath6kl/Kconfig" source "drivers/net/wireless/ath/ar5523/Kconfig" source "drivers/net/wireless/ath/wil6210/Kconfig" endif --- The current way kconfig works, it processes new source files after the first file is completed. It creates an array of new source config files and when the one file is finished, it continues with the next file. Unfortunately, this means that it loses the fact that the source file is within an "if" statement, and this means that each of these source file's configs will not have the proper dependencies set. As ATH9K requires ATH_CARDS set, the localmodconfig did not see that dependency, and did not enable ATH_CARDS. When the oldconfig was run, it forced ATH9K to be disabled. Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1304291022320.9234@oneiric Cc: stable@vger.kernel.org # 3.8+ Reported-by: Robert P. J. Day Tested-by: Robert P. J. Day Signed-off-by: Steven Rostedt --- scripts/kconfig/streamline_config.pl | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streaml= ine_config.pl index 343a568..4606cdf 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -156,7 +156,6 @@ sub read_kconfig { =20 my $state =3D "NONE"; my $config; - my @kconfigs; =20 my $cont =3D 0; my $line; @@ -190,7 +189,13 @@ sub read_kconfig { =20 # collect any Kconfig sources if (/^source\s*"(.*)"/) { - $kconfigs[$#kconfigs+1] =3D $1; + my $kconfig =3D $1; + # prevent reading twice. + if (!defined($read_kconfigs{$kconfig})) { + $read_kconfigs{$kconfig} =3D 1; + read_kconfig($kconfig); + } + next; } =20 # configs found @@ -250,14 +255,6 @@ sub read_kconfig { } } close($kinfile); - - # read in any configs that were found. - foreach my $kconfig (@kconfigs) { - if (!defined($read_kconfigs{$kconfig})) { - $read_kconfigs{$kconfig} =3D 1; - read_kconfig($kconfig); - } - } } =20 if ($kconfig) { --=20 1.7.10.4 --00GvhwF7k39YY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJRfwKqAAoJEOdOSU1xswtMaNAH/iSV85JWaOGA2uYzNZpcx4j9 AVS9k/ySEUiW39x2tr0Y3w5xV6MwElVnyshFYsE/7+fi8/luQSEv2RWWpVdKluSo z52zLdbWdRrUiaZrBFEzQhk7QihMvEPdrJ0nR2SxusOYxVRNNPkHbxizXbDZqKoJ OfO6+lpCrChHXKFp8dpuKFidkw2EQrEXGjTtQcQZMfX4TNczuV6/HYLzesUiM9Nm sMce2UEgYfsY2SezCKYpRTr8sZo0INp8o3ba+YR2wsEg/EKooptjWRBfaCSoEMMC E62XaflP/vLSRi8ITavpuB4lsTXgfeOblilZWbdaIOeq1MtjnUMLQuhs0i05c2U= =w9LI -----END PGP SIGNATURE----- --00GvhwF7k39YY--