Patchwork [v3,resend] config: make it possible to specify which config file to use for 'make defconfig'

login
register
mail settings
Submitter Arnout Vandecappelle
Date April 28, 2012, 5:14 p.m.
Message ID <1335633290-8734-1-git-send-email-arnout@mind.be>
Download mbox | patch
Permalink /patch/155675/
State Accepted
Commit 33f454bbef77638a29ec24807e30740323e15b3e
Headers show

Comments

Arnout Vandecappelle - April 28, 2012, 5:14 p.m.
So that this works:

 % make defconfig BR2_DEFCONFIG=~/buildroot-defconfig

Right now we have to do:

 % cp ~/buildroot-defconfig configs/buildroot_defconfig
 % make buildroot_defconfig

That would dirty the buildroot tree and requires it to be writable.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
v3:
* Acked by ThomasP

v2:
* Use $(if...) instead of $(patsubst...)
* Add help text
* Fix commit message

 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Peter Korsgaard - May 5, 2012, 9:39 p.m.
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:

 Arnout> So that this works:
 Arnout>  % make defconfig BR2_DEFCONFIG=~/buildroot-defconfig

 Arnout> Right now we have to do:

 Arnout>  % cp ~/buildroot-defconfig configs/buildroot_defconfig
 Arnout>  % make buildroot_defconfig

 Arnout> That would dirty the buildroot tree and requires it to be writable.

 Arnout> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 Arnout> Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
 Arnout> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Committed, thanks.

Patch

diff --git a/Makefile b/Makefile
index cc8124a..a7625ba 100644
--- a/Makefile
+++ b/Makefile
@@ -540,7 +540,7 @@  silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@$(COMMON_CONFIG_ENV) $< --defconfig $(CONFIG_CONFIG_IN)
+	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(BR2_DEFCONFIG),=$(BR2_DEFCONFIG)) $(CONFIG_CONFIG_IN)
 
 %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
@@ -603,6 +603,7 @@  help:
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
 	@echo '  randconfig             - New config with random answer to all options'
 	@echo '  defconfig              - New config with default answer to all options'
+	@echo '                             BR2_DEFCONFIG, if set, is used as input'
 	@echo '  savedefconfig          - Save current config as ./defconfig (minimal config)'
 	@echo '  allyesconfig           - New config where all options are accepted with yes'
 	@echo '  allnoconfig            - New config where all options are answered with no'