[GIT PULL] localmodconfig: Use Kbuild files too

From: Steven Rostedt
Date: Tue Aug 11 2015 - 17:43:34 EST


Leonidas Spyropoulos found that modules like nouveau were being unselected
by make localmodconfig even though their configs were set and the module
was loaded and visible by lsmod. The reason for this was because
streamline-config.pl only looks at Makefiles, and not Kbuild files. As
these modules use Kbuild for their names, they too need to be checked
by localmodconfig. This was fixed by Richard Weinberger.

Please pull the latest localmodconfig-v4.2-rc6 tree, which can be found at:


Tag SHA1: 710199a2ef064bca49465b39b48d91c3955cc36e
Head SHA1: c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a

Richard Weinberger (1):
localmodconfig: Use Kbuild files too

scripts/kconfig/streamline_config.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a
Author: Richard Weinberger <richard@xxxxxx>
Date: Mon Jul 27 00:06:55 2015 +0200

localmodconfig: Use Kbuild files too

In kbuild it is allowed to define objects in files named "Makefile"
and "Kbuild".
Currently localmodconfig reads objects only from "Makefile"s and misses
modules like nouveau.

Link: http://lkml.kernel.org/r/1437948415-16290-1-git-send-email-richard@xxxxxx

Cc: stable@xxxxxxxxxxxxxxx
Reported-and-tested-by: Leonidas Spyropoulos <artafinde@xxxxxxxxx>
Signed-off-by: Richard Weinberger <richard@xxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 9cb8522d8d22..f3d3fb42b873 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -137,7 +137,7 @@ my $ksource = ($ARGV[0] ? $ARGV[0] : '.');
my $kconfig = $ARGV[1];
my $lsmod_file = $ENV{'LSMOD'};

-my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
+my @makefiles = `find $ksource -name Makefile -or -name Kbuild 2>/dev/null`;
chomp @makefiles;

my %depends;
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/