aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSergey Ryazanov <ryazanov.s.a@gmail.com>2017-04-20 05:10:45 +0300
committerJo-Philipp Wich <jo@mein.io>2017-05-02 16:11:09 +0200
commit37cf92135272e3892b61335725c291a8828ea2c0 (patch)
tree6b37de244d6b38cc05e700dbe24af66ac2a6fcd0 /include
parent8b9f7bd7bd911a8677b6fa8256ab521417f326bf (diff)
downloadupstream-37cf92135272e3892b61335725c291a8828ea2c0.tar.gz
upstream-37cf92135272e3892b61335725c291a8828ea2c0.tar.bz2
upstream-37cf92135272e3892b61335725c291a8828ea2c0.zip
build: fix symlinked .config handling
When running "make menuconfig" with symlinked .config (e.g. to env/.config) it renames symlink to .config.old, creates new .config file and writes updated configuration here. This breaks the desired workflow when changes in the configuration could be checked using "scripts/env diff" and commited with "scripts/env save". Since the env/.config file is not updated. Fix this issue by exporting KCONFIG_OVERWRITECONFIG=1, which forces mconf to overwrite the .config content, instead of renaming it and creating a new file. This variable is set only if .config is a symlink, otherwise the variable is not exported and the old behaviour is preserved. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/toplevel.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk
index 24e4ebf823..c90670bee6 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -126,7 +126,7 @@ menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \
cp $(HOME)/.openwrt/defconfig .config; \
fi
- $< Config.in
+ [ -L .config ] && export KCONFIG_OVERWRITECONFIG=1; $< Config.in
prepare_kernel_conf: .config FORCE