Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d550ae authored by Arnaud Lacombe's avatar Arnaud Lacombe
Browse files

kconfig/streamline_config.pl: use options to determine operating mode 



The options introduced are --localmodconfig (default) and --localyesconfig.
They match the Makefile target behavior.

Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
parent f597a718

scripts/kconfig/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ silentoldconfig: $(obj)/conf 


localmodconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)mkdir -p include/generated

	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config

	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config

	$(Q)if [ -f .config ]; then 					\

			cmp -s .tmp.config .config ||			\

			(mv -f .config .config.old.1;			\
@@ -50,7 +50,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 


localyesconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)mkdir -p include/generated

	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config

	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config

	$(Q)sed -i s/=m/=y/ .tmp.config

	$(Q)if [ -f .config ]; then					\

			cmp -s .tmp.config .config ||			\

scripts/kconfig/streamline_config.pl

+13 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#    make oldconfig

#

use strict;

use Getopt::Long;



my $config = ".config";
@@ -112,6 +113,13 @@ sub find_config { 


find_config;



# Parse options

my $localmodconfig = 0;

my $localyesconfig = 0;



GetOptions("localmodconfig" => \$localmodconfig,

	   "localyesconfig" => \$localyesconfig);



# Get the build source and top level Kconfig file (passed in)

my $ksource = $ARGV[0];

my $kconfig = $ARGV[1];
@@ -425,7 +433,11 @@ while(<CIN>) { 


    if (/^(CONFIG.*)=(m|y)/) {

	if (defined($configs{$1})) {

	    if ($localyesconfig) {

	        $setconfigs{$1} = 'y';

	    } else {

	        $setconfigs{$1} = $2;

	    }

	} elsif ($2 eq "m") {

	    print "# $1 is not set\n";

	    next;