Re: [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist

[Alexander Dahl <ada@thorsis.com>]

Hello Lars,

Am Fri, Aug 01, 2025 at 11:14:55AM +0200 schrieb Lars Schmidt:
> This inject script just copies from source to target and
> does not create the target directory. So if the target dir
> does not exist yet, the injection of files is not happening.
> Until a ptxdist patch is upstream, this script is copied we
> will apply the patch here.

I assume you copied the script from ptxdist here, this is the
unmodified script, and the actual change happens in the other patch
right?

This is not reflected in this commit message, which is actually rather
confusing, at least to me.

In the past I followed the same approach when "patching" things in a
BSP before porting it back to ptxdist.  It's easier like this, because
you can just apply the same patch from the BSP to ptxdist.

Would be easier to understand though if the commit message here just
states a file is copied from ptxdist version xyz, as preparation for
an upcoming change, and not describe that change in detail here
already.

Greets
Alex

> 
> Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
> ---
>  scripts/lib/ptxd_make_world_inject.sh | 60 +++++++++++++++++++++++++++
>  1 file changed, 60 insertions(+)
>  create mode 100644 scripts/lib/ptxd_make_world_inject.sh
> 
> diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
> new file mode 100644
> index 0000000..e8e94fb
> --- /dev/null
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -0,0 +1,60 @@
> +#!/bin/bash
> +#
> +# Copyright (C) 2021 by Michael Riesch <michael.riesch@wolfvision.net>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +ptxd_make_inject() {
> +    local source target
> +
> +    source="$(echo ${inject_file} | cut -d ":" -f 1)"
> +    target="${inject_dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
> +
> +    if [[ "${source}" =~ ^/.* ]]; then
> +	ptxd_bailout "'${source}' must not be an absolute path!" \
> +	    "Use <PKG>_INJECT_PATH to specify the search path."
> +    fi
> +
> +    if ! ptxd_in_path pkg_inject_path "${source}"; then
> +	ptxd_bailout "Blob '${source}' not found in '${pkg_inject_path}'."
> +    fi
> +    source="${ptxd_reply}"
> +
> +    echo -e "\nInject file $(ptxd_print_path ${source}) into" \
> +	 "$(ptxd_print_path ${target})..."
> +    cp ${source} ${target}
> +}
> +export -f ptxd_make_inject
> +
> +
> +ptxd_make_world_inject() {
> +    ptxd_make_world_init || return
> +
> +    if [ -z "${pkg_inject_oot}" ]; then
> +	pkg_inject_oot=NO
> +    fi
> +
> +    case "${pkg_inject_oot}" in
> +	"YES") inject_dest="${pkg_build_dir}" ;;
> +	"NO")  inject_dest="${pkg_dir}" ;;
> +	*)     ptxd_bailout "<PKG>_INJECT_OOT: please set to YES or NO" ;;
> +    esac
> +
> +    if [ "${pkg_build_oot:-NO}" = 'NO' ] && [ "${pkg_inject_oot}" != 'NO' ]; then
> +	ptxd_warning "<PKG>_BUILD_OOT and <PKG>_INJECT_OOT contradict each other." \
> +	    "Using $(ptxd_print_path ${inject_dest}) as inject destination anyways."
> +    fi
> +
> +    if [ ! -d "${inject_dest}" ]; then
> +	ptxd_bailout "<PKG> inject destination dir missing." \
> +	    "Correct placement of world/inject depends on <PKG>_BUILD_OOT and <PKG>_INJECT_OOT." \
> +	    "Check order of calls in prepare stage!"
> +    fi
> +
> +    for inject_file in ${pkg_inject_files}; do
> +	ptxd_make_inject || return
> +    done
> +}
> +export -f ptxd_make_world_inject
> -- 
> 2.39.5
> 
>