diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-09-02 18:25:06 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2013-09-02 18:25:06 +0000 |
| commit | c463728b2d35651fd4cec9ec0379cdfd210a65b1 (patch) | |
| tree | eb263708e2a5b8176941f3ef4b156d300c4e0a09 | |
| parent | 33e7337d97e91d836eda6d59f6812e184ab2b88c (diff) | |
| download | upstream-c463728b2d35651fd4cec9ec0379cdfd210a65b1.tar.gz upstream-c463728b2d35651fd4cec9ec0379cdfd210a65b1.tar.bz2 upstream-c463728b2d35651fd4cec9ec0379cdfd210a65b1.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>
SVN-Revision: 37883
| -rw-r--r-- | include/toplevel.mk | 3 |
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 \ |