Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Use <PKG>_DIR directly

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

Thanks, applied as 0eea7080662b36cd39f03a3b0785d0e4a1c346bc.

Michael

[sent from post-receive hook]

On Sun, 12 May 2024 15:16:41 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> pkg_source was defined as "$($(1)_DIR)" which is the same as pkg_dir in
> ptxd_make_world_common.  We can use pkg_dir directly.  Add a safe-guard
> to bail out early if that var is empty.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Acked-by: Michael Riesch <michael.riesch@wolfvision.net>
> Message-Id: <20240506105051.323546-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/post/ptxd_make_world_inject.make b/rules/post/ptxd_make_world_inject.make
> index b7d28e92f25b..3506ee1140e1 100644
> --- a/rules/post/ptxd_make_world_inject.make
> +++ b/rules/post/ptxd_make_world_inject.make
> @@ -9,8 +9,7 @@
>  world/inject/env = \
>  	$(call world/env, $(1)) \
>  	pkg_inject_path="$($(1)_INJECT_PATH)" \
> -	pkg_inject_files="$($(1)_INJECT_FILES)" \
> -	pkg_source="$($(1)_DIR)"
> +	pkg_inject_files="$($(1)_INJECT_FILES)"
>  
>  world/inject = \
>  	$(call world/inject/env,$(strip $(1))) \
> diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
> index 5c2d0dc5fb3e..b74e464c6895 100644
> --- a/scripts/lib/ptxd_make_world_inject.sh
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -10,7 +10,7 @@ ptxd_make_inject() {
>      local source target
>  
>      source="$(echo ${inject_file} | cut -d ":" -f 1)"
> -    target="${pkg_source}/$(echo ${inject_file} | cut -d ":" -f 2)"
> +    target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)"
>  
>      if [[ "${source}" =~ ^/.* ]]; then
>  	ptxd_bailout "'${source}' must not be an absolute path!" \
> @@ -32,6 +32,10 @@ export -f ptxd_make_inject
>  ptxd_make_world_inject() {
>      ptxd_make_world_init || return
>  
> +    if [ -z "${pkg_dir}" ]; then
> +	ptxd_bailout "<PKG>_DIR empty, no destination to inject to."
> +    fi
> +
>      for inject_file in ${pkg_inject_files}; do
>  	ptxd_make_inject || return
>      done