From: Arseny Maslennikov <ar@cs.msu.ru>
To: Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Arseny Maslennikov <ar@cs.msu.ru>,
Randy Dunlap <rdunlap@infradead.org>,
Sam Ravnborg <sam@ravnborg.org>,
Ulf Magnusson <ulfalizer@gmail.com>, Petr Vorel <pvorel@suse.cz>
Subject: [PATCH] scripts/kconfig/Makefile: use KCONFIG_CONFIG if set
Date: Fri, 22 Feb 2019 00:58:58 +0300 [thread overview]
Message-ID: <20190221215901.23970-2-ar@cs.msu.ru> (raw)
In-Reply-To: <20190221215901.23970-1-ar@cs.msu.ru>
In a kernel source tree:
% make mrproper
% make KCONFIG_CONFIG=.myconfig kvmconfig'
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
HOSTCC scripts/kconfig/confdata.o
HOSTCC scripts/kconfig/expr.o
HOSTCC scripts/kconfig/symbol.o
HOSTCC scripts/kconfig/preprocess.o
LEX scripts/kconfig/zconf.lex.c
YACC scripts/kconfig/zconf.tab.h
HOSTCC scripts/kconfig/zconf.lex.o
YACC scripts/kconfig/zconf.tab.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
The base file '.config' does not exist. Exit.
make[1]: *** [scripts/kconfig/Makefile:96: kvm_guest.config] Error 1
make: *** [Makefile:538: kvmconfig] Error 2
Essentially `make kvmconfig' (and probably other similar targets)
did ignore KCONFIG_CONFIG set to a different filename.
If KCONFIG_CONFIG is set, use it; otherwise behave as if it was set
to `.config'.
Signed-off-by: Arseny Maslennikov <ar@cs.msu.ru>
---
scripts/kconfig/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 181973509a05..1c7ac07def4d 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -93,7 +93,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
%.config: $(obj)/conf
$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m $(KCONFIG_CONFIG) $(configfiles)
+$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
PHONY += kvmconfig
--
2.20.1
next prev parent reply other threads:[~2019-02-21 22:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 21:58 [PATCH] scripts/package/Makefile: put proper config in source tarball Arseny Maslennikov
2019-02-21 21:58 ` Arseny Maslennikov [this message]
2019-03-01 12:33 ` [PATCH] scripts/kconfig/Makefile: use KCONFIG_CONFIG if set Petr Vorel
2019-03-09 13:12 ` Arseny Maslennikov
2019-02-21 21:58 ` [PATCH] scripts/package/mkdebian: expose KCONFIG_CONFIG to debian/rules Arseny Maslennikov
2019-03-01 13:32 ` Petr Vorel
2019-03-07 15:29 ` Masahiro Yamada
2019-03-01 13:34 ` [PATCH] scripts/package/Makefile: put proper config in source tarball Petr Vorel
2019-03-07 15:32 ` Masahiro Yamada
2019-03-07 19:05 ` Arseny Maslennikov
2019-03-07 19:08 ` Arseny Maslennikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190221215901.23970-2-ar@cs.msu.ru \
--to=ar@cs.msu.ru \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pvorel@suse.cz \
--cc=rdunlap@infradead.org \
--cc=sam@ravnborg.org \
--cc=ulfalizer@gmail.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).