From: John Crispin Date: Mon, 4 Jul 2016 09:08:58 +0000 (+0200) Subject: include/toplevel.mk: fix defconfig when ~/.openwrt/defconfig exists X-Git-Tag: v19.07.0-rc1~9750 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b728074160b;p=openwrt%2Fstaging%2Fhauke.git include/toplevel.mk: fix defconfig when ~/.openwrt/defconfig exists ./scripts/feeds update will reset the .config file if ~/.openwrt/defconfig exists, thus resetting the target to ar71xx. Signed-off-by: John Crispin --- diff --git a/include/toplevel.mk b/include/toplevel.mk index 581083d912..3844f3cfc1 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -110,7 +110,7 @@ config-clean: FORCE defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config - @if [ -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi + @if [ -s .config -a -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi $< --defconfig=.config Config.in confdefault-y=allyes