Re: [ptxdist] [PATCH v1 2/2] pre/barebox: barebox-opts doesn't need any parameters

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

On Wed, Jun 05, 2019 at 04:51:40PM +0200, Roland Hieber wrote:
> $(1) is never used in the barebox/opts macro, so barebox-opts doesn't
> need to pass it around.
> 
> Also adjust the package template accordingly.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>

I'd like to keep this for now. I have vague plans for out-of-tree builds to
make it possible to share the same git tree via local-src. When that
happens, the argument will be needed.

Michael

> ---
>  rules/pre/barebox.make                | 2 +-
>  rules/templates/template-barebox-make | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/pre/barebox.make b/rules/pre/barebox.make
> index 7875442cf935..bc7fe4340f87 100644
> --- a/rules/pre/barebox.make
> +++ b/rules/pre/barebox.make
> @@ -12,17 +12,17 @@
>  barebox/opts = \
>  	$(PARALLELMFLAGS) \
>  	V=$(PTXDIST_VERBOSE) \
>  	HOSTCC=$(HOSTCC) \
>  	ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \
>  	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE)
>  
>  barebox-opts = \
> -	$(call barebox/opts,$(strip $(1)))
> +	$(call barebox/opts)
>  
>  barebox/url = \
>  	http://www.barebox.org/download/barebox-$($(1)_VERSION).$($(1)_SUFFIX)
>  
>  barebox-url = \
>  	$(call barebox/url,$(strip $(1)))
>  
>  # vim: syntax=make
> diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
> index 7493b849b6ab..4ada3c20bf00 100644
> --- a/rules/templates/template-barebox-make
> +++ b/rules/templates/template-barebox-make
> @@ -36,17 +36,17 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	TARGET_HARDEN_STACKCLASH \
>  	TARGET_HARDEN_RELRO \
>  	TARGET_HARDEN_BINDNOW \
>  	TARGET_HARDEN_PIE \
>  	TARGET_DEBUG \
>  	TARGET_BUILD_ID
>  
> -BAREBOX_@PACKAGE@_CONF_OPT := $(call barebox-opts, BAREBOX_@PACKAGE@)
> +BAREBOX_@PACKAGE@_CONF_OPT := $(call barebox-opts)
>  BAREBOX_@PACKAGE@_MAKE_OPT := $(BAREBOX_@PACKAGE@_CONF_OPT)
>  
>  BAREBOX_@PACKAGE@_IMAGES := @image@
>  BAREBOX_@PACKAGE@_IMAGES := $(addprefix $(BAREBOX_@PACKAGE@_DIR)/,$(BAREBOX_@PACKAGE@_IMAGES))
>  
>  ifdef PTXCONF_BAREBOX_@PACKAGE@
>  $(BAREBOX_@PACKAGE@_CONFIG):
>  	@echo
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de