aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-09-02 18:25:06 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-09-02 18:25:06 +0000
commite72590431149ea4bb65199b92d7a460ec3d6926d (patch)
tree8055de41a1d06a366a2546b9fc5cf819cb0ef599
parentd7267017a6a631007f276b53cbe06cf2b258544d (diff)
downloadupstream-e72590431149ea4bb65199b92d7a460ec3d6926d.tar.gz
upstream-e72590431149ea4bb65199b92d7a460ec3d6926d.tar.bz2
upstream-e72590431149ea4bb65199b92d7a460ec3d6926d.zip
build scripts: fix 'make defconfig' damage
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 <philipp@redfish-solutions.com> [florian: apply with the proper patch level, wrap at 80 columns] Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37883 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/toplevel.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk
index b8608eeaeb..a623be9f2e 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -89,6 +89,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
$< --defconfig=.config Config.in
confdefault-y=allyes
@@ -152,7 +153,7 @@ prereq:: prepare-tmpinfo .config
@+$(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 \