From: Arnaud Lacombe <lacombar@gmail.com>
To: Michal Marek <mmarek@suse.cz>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
Arnaud Lacombe <lacombar@gmail.com>
Subject: [PATCH 4/4] kconfig: do not hardcode .config
Date: Tue, 16 Aug 2011 01:34:14 -0400 [thread overview]
Message-ID: <1313472854-14426-5-git-send-email-lacombar@gmail.com> (raw)
In-Reply-To: <1313472854-14426-1-git-send-email-lacombar@gmail.com>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
scripts/kconfig/Makefile | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index dabb4f1..a86924b 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -10,6 +10,8 @@ KCONFIG_CONFIG ?= .config
KCONFIG_DEFCONFIG ?=
export KCONFIG_CONFIG
+dot-config := $(KCONFIG_CONFIG)
+
xconfig: $(obj)/qconf
$< $(Kconfig)
@@ -43,14 +45,14 @@ endif
localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)mkdir -p include/generated
$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
- $(Q)if [ -f .config ]; then \
- cmp -s .tmp.config .config || \
- (mv -f .config .config.old.1; \
- mv -f .tmp.config .config; \
+ $(Q)if [ -f $(dot-config) ]; then \
+ cmp -s .tmp.config .$(dot-config) || \
+ (mv -f $(dot-config) $(dot-config).old.1; \
+ mv -f .tmp.config $(dot-config); \
$(obj)/conf --silentoldconfig $(Kconfig); \
- mv -f .config.old.1 .config.old) \
+ mv -f $(dot-config).old.1 $(dot-config).old) \
else \
- mv -f .tmp.config .config; \
+ mv -f .tmp.config $(dot-config); \
$(obj)/conf --silentoldconfig $(Kconfig); \
fi
$(Q)rm -f .tmp.config
@@ -126,7 +128,7 @@ help:
@echo ' menuconfig - Update current config utilising a menu based program'
@echo ' xconfig - Update current config utilising a QT based front-end'
@echo ' gconfig - Update current config utilising a GTK based front-end'
- @echo ' oldconfig - Update current config utilising a provided .config as base'
+ @echo ' oldconfig - Update current config utilising a provided $(dot-config) as base'
@echo ' localmodconfig - Update current config disabling modules not loaded'
@echo ' localyesconfig - Update current config converting local mods to core'
@echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
--
1.7.6.153.g78432
next prev parent reply other threads:[~2011-08-16 5:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-16 5:34 [PATCH 0/4] Kbuild/Kconfig Arnaud Lacombe
2011-08-16 5:34 ` [PATCH 1/4] kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG Arnaud Lacombe
2011-09-16 12:31 ` Michal Marek
2011-09-16 12:33 ` Michal Marek
2011-08-16 5:34 ` [PATCH 2/4] kbuild: reduce kbuild invasivity within kconfig Arnaud Lacombe
2011-08-16 5:34 ` [PATCH 3/4] kbuild: do not hardcode .config Arnaud Lacombe
2011-08-16 5:34 ` Arnaud Lacombe [this message]
2011-08-22 15:49 ` [PATCH 0/4] Kbuild/Kconfig Arnaud Lacombe
2011-08-30 0:29 ` Arnaud Lacombe
2011-09-06 15:05 ` Arnaud Lacombe
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=1313472854-14426-5-git-send-email-lacombar@gmail.com \
--to=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
/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
Powered by JetHome