[Buildroot] [PATCH v2 2/5] Makefile: Generate %_defconfig recipes from macro.

Sam Bobroff sam.bobroff at au1.ibm.com
Tue Jun 21 23:19:31 UTC 2016


On Wed, Jun 22, 2016 at 12:12:02AM +0200, Romain Naour wrote:
> Hi Sam, All
> 
> Le 21/06/2016 à 06:56, Sam Bobroff a écrit :
> > From: Patrick Williams <patrick at stwcx.xyz>
> > 
> > To reduce duplication in the %_defconfig recipes with $(TOPDIR) and
> > $(BR2_EXTERNAL) versions, generate these from a macro.  The macro is
> > now called on a list of directories containing the appropriate ones.
> > 
> > Signed-off-by: Patrick Williams <patrick at stwcx.xyz>
> 
> Your Sob is missing here and for the following patches, see
> http://nightly.buildroot.org/manual.html#submitting-patches

Ah, thanks. I'll fix that for the next version.

Cheers,
Sam.

> Best regards,
> Romain
> 
> > ---
> >  Makefile | 15 ++++++++-------
> >  1 file changed, 8 insertions(+), 7 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index 9f3fc92..e78b9e2 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -842,13 +842,14 @@ defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
> >  	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)
> >  
> >  # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig
> > -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile
> > -	@$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(TOPDIR)/configs/$@ \
> > -		$< --defconfig=$(TOPDIR)/configs/$@ $(CONFIG_CONFIG_IN)
> > +define CREATE_DEFCONFIG_RECIPES
> > +%_defconfig: $$(BUILD_DIR)/buildroot-config/conf $1/%_defconfig outputmakefile
> > +	@$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$$(TOPDIR)/configs/$$@ \
> > +		$$< --defconfig=$1/$$@ $$(CONFIG_CONFIG_IN)
> > +endef
> >  
> > -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(BR2_EXTERNAL)/configs/%_defconfig outputmakefile
> > -	@$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(BR2_EXTERNAL)/configs/$@ \
> > -		$< --defconfig=$(BR2_EXTERNAL)/configs/$@ $(CONFIG_CONFIG_IN)
> > +BR2_DEFCONFIG_PATHS=$(TOPDIR)/configs $(BR2_EXTERNAL)/configs
> > +$(foreach path,$(BR2_DEFCONFIG_PATHS),$(eval $(call CREATE_DEFCONFIG_RECIPES,$(path))))
> >  
> >  savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
> >  	@$(COMMON_CONFIG_ENV) $< \
> > @@ -894,7 +895,7 @@ $(1): $$(BUILD_DIR)/buildroot-config/conf $(call CONFIG_FILE_LIST,$2 $3) outputm
> >  	@rm -rf $$(CONFIG_DIR)/.merge_config
> >  endef
> >  
> > -$(foreach d,$(TOPDIR)/configs $(BR2_EXTERNAL)/configs,$(eval -include $(d)/*.mk))
> > +$(foreach d,$(BR2_DEFCONFIG_PATHS),$(eval -include $(d)/*.mk))
> >  
> >  ################################################################################
> >  #
> > 



More information about the buildroot mailing list