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

Message ID	469f863632a69c04b8522ad2a49c4efc50704ca6.1466484997.git.sam.bobroff@au1.ibm.com
State	Superseded
Headers	show Return-Path: <buildroot-bounces@busybox.net> field: "References" field: "References" Gateway: Authorized Use Only! Violators will be prosecuted for <buildroot@busybox.net> from <sam.bobroff@au1.ibm.com>; Tue, 21 Jun 2016 14:56:50 +1000 Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 21 Jun 2016 14:56:47 +1000 From: Sam Bobroff <sam.bobroff@au1.ibm.com> To: buildroot@busybox.net Date: Tue, 21 Jun 2016 14:56:42 +1000 In-Reply-To: <cover.1466484997.git.sam.bobroff@au1.ibm.com> References: <cover.1466484997.git.sam.bobroff@au1.ibm.com> In-Reply-To: <cover.1466484997.git.sam.bobroff@au1.ibm.com> References: <cover.1466484997.git.sam.bobroff@au1.ibm.com> Message-Id: <469f863632a69c04b8522ad2a49c4efc50704ca6.1466484997.git.sam.bobroff@au1.ibm.com> Cc: patrick@stwcx.xyz, sam@mendozajonas.com, eliner@us.ibm.com Subject: [Buildroot] [PATCH v2 2/5] Makefile: Generate %_defconfig recipes from macro. Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>

Message ID

469f863632a69c04b8522ad2a49c4efc50704ca6.1466484997.git.sam.bobroff@au1.ibm.com

State

Superseded

Headers

From: Sam Bobroff <sam.bobroff@au1.ibm.com>
To: buildroot@busybox.net
Date: Tue, 21 Jun 2016 14:56:42 +1000
In-Reply-To: <cover.1466484997.git.sam.bobroff@au1.ibm.com>
References: <cover.1466484997.git.sam.bobroff@au1.ibm.com>
In-Reply-To: <cover.1466484997.git.sam.bobroff@au1.ibm.com>
References: <cover.1466484997.git.sam.bobroff@au1.ibm.com>
Message-Id: <469f863632a69c04b8522ad2a49c4efc50704ca6.1466484997.git.sam.bobroff@au1.ibm.com>
Cc: patrick@stwcx.xyz, sam@mendozajonas.com, eliner@us.ibm.com
Subject: [Buildroot] [PATCH v2 2/5] Makefile: Generate %_defconfig recipes
	from macro.
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Commit Message

Sam Bobroff June 21, 2016, 4:56 a.m. UTC

From: Patrick Williams <patrick@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@stwcx.xyz>
---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Comments

Romain Naour June 21, 2016, 10:12 p.m. UTC | #1

Hi Sam, All

Le 21/06/2016 à 06:56, Sam Bobroff a écrit :
> From: Patrick Williams <patrick@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@stwcx.xyz>

Your Sob is missing here and for the following patches, see
http://nightly.buildroot.org/manual.html#submitting-patches

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))
>  
>  ################################################################################
>  #
>

Sam Bobroff June 21, 2016, 11:19 p.m. UTC | #2

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@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@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))
> >  
> >  ################################################################################
> >  #
> >

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))
 
 ################################################################################
 #

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

Commit Message

Comments

Patch