Re: [ptxdist] [PATCH 1/3] barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Aug 07, 2020 at 12:44:23PM +0200, Roland Hieber wrote:
> Until now this worked without setting the variable because
> ptxd_make_world_init tries to autodetect the config tool, but we should
> make this explicit.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/barebox.make                              | 1 +
>  rules/kernel.make                               | 1 +
>  rules/templates/template-barebox-imx-habv4-make | 1 +
>  rules/templates/template-barebox-make           | 1 +
>  rules/templates/template-kernel-make            | 1 +
>  5 files changed, 5 insertions(+)
> 
> diff --git a/rules/barebox.make b/rules/barebox.make
> index 2a9262a44032..b2ca49b9fb85 100644
> --- a/rules/barebox.make
> +++ b/rules/barebox.make
> @@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH)
>  BAREBOX_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_CONF_TOOL := kconfig
>  BAREBOX_CONF_OPT := \

I prefer tab aligned ':=' when there are multiple lines...

>  	-C $(BAREBOX_DIR) \
>  	O=$(BAREBOX_BUILD_DIR) \
> diff --git a/rules/kernel.make b/rules/kernel.make
> index 7032b0caaba0..d1df7f98f515 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -79,6 +79,7 @@ KERNEL_SHARED_OPT += \
>  	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
>  endif
>  
> +KERNEL_CONF_TOOL := kconfig
>  KERNEL_CONF_OPT := \
>  	$(KERNEL_SHARED_OPT)
>  
> diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
> index 3ee6e83805bb..09c099bb5076 100644
> --- a/rules/templates/template-barebox-imx-habv4-make
> +++ b/rules/templates/template-barebox-imx-habv4-make
> @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
>  BAREBOX_@PACKAGE@_CONF_OPT := \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
> diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
> index 9bed9dbeb7c9..dc30dc57c4b1 100644
> --- a/rules/templates/template-barebox-make
> +++ b/rules/templates/template-barebox-make
> @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
>  BAREBOX_@PACKAGE@_CONF_OPT := \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
> diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
> index c53110165ec3..77bcd628948d 100644
> --- a/rules/templates/template-kernel-make
> +++ b/rules/templates/template-kernel-make
> @@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT	+= \
>  	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
>  	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
>  
> +KERNEL_@PACKAGE@_CONF_TOOL := kconfig
>  KERNEL_@PACKAGE@_CONF_OPT	:= \

Especially here where the existing line already has the tab.

Michael

>  	$(KERNEL_@PACKAGE@_SHARED_OPT)
>  
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de