Re: [RFC 05/15] u-boot: Do not use shell environment

[Jan Kiszka <jan.kiszka@siemens.com>]

On 26.07.21 15:46, Anton Mikanovich wrote:
> To make package build process independent of the shell environment we
> should remove U_BOOT_CONFIG and U_BOOT_BIN passing through export call.
> So we migrate to template-based debian/rules file.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  .../u-boot/files/debian/{rules => rules.tmpl}          |  2 +-
>  meta/recipes-bsp/u-boot/u-boot-custom.inc              | 10 ++++------
>  2 files changed, 5 insertions(+), 7 deletions(-)
>  rename meta/recipes-bsp/u-boot/files/debian/{rules => rules.tmpl} (93%)
> 
> diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl
> similarity index 93%
> rename from meta/recipes-bsp/u-boot/files/debian/rules
> rename to meta/recipes-bsp/u-boot/files/debian/rules.tmpl
> index 85bda91..0507fc5 100755
> --- a/meta/recipes-bsp/u-boot/files/debian/rules
> +++ b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl
> @@ -13,7 +13,7 @@ SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y
>  endif
>  
>  override_dh_auto_build:
> -	$(MAKE) $(PARALLEL_MAKE) $(U_BOOT_CONFIG)
> +	$(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG}
>  	$(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN}
>  	./scripts/get_default_envs.sh >u-boot-initial-env
>  	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools
> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> index 9984d8c..819206a 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> @@ -26,8 +26,8 @@ python() {
>  
>  DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
>  
> -TEMPLATE_FILES = "debian/control.tmpl"
> -TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
> +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl"
> +TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN"
>  
>  U_BOOT_TOOLS_PACKAGE ?= "0"
>  U_BOOT_CONFIG_PACKAGE ?= "0"
> @@ -70,9 +70,7 @@ u-boot-initial-env /etc
>  fw_env.config      /etc
>  EOF
>      fi
> -}
>  
> -dpkg_runbuild_prepend() {
> -    export U_BOOT_CONFIG="${U_BOOT_CONFIG}"
> -    export U_BOOT_BIN="${U_BOOT_BIN}"
> +    # restore execute permissions
> +    chmod a+x ${S}/debian/rules
>  }
> 

This will likely break users providing their own rules while expecting
the interface to stay the same. Better use the builder-export magic
consistently, not the tmpl pattern.

Comment likely applies to other recipes inc files as well.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux