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

Commit f597a718 authored by Arnaud Lacombe's avatar Arnaud Lacombe
Browse files

kconfig/streamline_config.pl: directly access LSMOD from the environment 



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

scripts/kconfig/Makefile

+2 −10
Original line number Diff line number Diff line
@@ -33,17 +33,9 @@ silentoldconfig: $(obj)/conf 
	$(Q)mkdir -p include/generated

	$< --$@ $(Kconfig)



# if no path is given, then use src directory to find file

ifdef LSMOD

LSMOD_F := $(LSMOD)

ifeq ($(findstring /,$(LSMOD)),)

  LSMOD_F := $(objtree)/$(LSMOD)

endif

endif



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

	$(Q)mkdir -p include/generated

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

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

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

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

			(mv -f .config .config.old.1;			\
@@ -58,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) $(LSMOD_F) > .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

+6 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ find_config; 
# Get the build source and top level Kconfig file (passed in)

my $ksource = $ARGV[0];

my $kconfig = $ARGV[1];

my $lsmod_file = $ARGV[2];

my $lsmod_file = $ENV{'LSMOD'};



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

chomp @makefiles;
@@ -296,8 +296,12 @@ my %modules; 


if (defined($lsmod_file)) {

    if ( ! -f $lsmod_file) {

	if ( -f $ENV{'objtree'}."/".$lsmod_file) {

	    $lsmod_file = $ENV{'objtree'}."/".$lsmod_file;

	} else {

		die "$lsmod_file not found";

	}

    }

    if ( -x $lsmod_file) {

	# the file is executable, run it

	open(LIN, "$lsmod_file|");