Looking at the target 'defconfig' in include/toplevel, it doesn't directly 
reference $(HOME)/.openwrt/defconfig nor does it reference any prerequisites 
using it as a target.

Therefore, building "defconfig" as a target uses the defaults in the tree, but 
not the defaults that a user might have explicitly specified.

This patch fixes this regression from r36361.

Signed-off-by: Philip Prindeville <phil...@redfish-solutions.com>

Index: include/toplevel.mk
===================================================================
--- include/toplevel.mk	(revision 37824)
+++ include/toplevel.mk	(working copy)
@@ -89,6 +89,7 @@
 
 defconfig: scripts/config/conf prepare-tmpinfo FORCE
 	touch .config
+	@if [ -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi
 	$< --defconfig=.config Config.in
 
 confdefault-y=allyes
@@ -152,7 +153,7 @@
 	@+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
 	@( \
 		cp .config tmp/.config; \
-		./scripts/config/conf --defconfig tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
+		./scripts/config/conf --defconfig=tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
 		if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
 			printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \
 		fi \
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to