On Mon, Jan 24, 2022 at 01:09:40PM +0100, Michael Riesch wrote:
> Some packages may require certain files that are maintained
> or generated outside of their source repository. For example,
> binary firmware blobs could be excluded from the sources due
> to licensing issues. Add a helper that allows to inject certain
> files into the source directory (usually in the prepare stage).
>
> Signed-off-by: Michael Riesch <[email protected]>
> ---
> rules/post/ptxd_make_world_inject.make | 19 ++++++++++++
> scripts/lib/ptxd_make_world_inject.sh | 42 ++++++++++++++++++++++++++
> 2 files changed, 61 insertions(+)
> create mode 100644 rules/post/ptxd_make_world_inject.make
> create mode 100644 scripts/lib/ptxd_make_world_inject.sh
>
> diff --git a/rules/post/ptxd_make_world_inject.make
> b/rules/post/ptxd_make_world_inject.make
> new file mode 100644
> index 000000000..b7d28e92f
> --- /dev/null
> +++ b/rules/post/ptxd_make_world_inject.make
> @@ -0,0 +1,19 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2021 by Michael Riesch <[email protected]>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +world/inject/env = \
> + $(call world/env, $(1)) \
> + pkg_inject_path="$($(1)_INJECT_PATH)" \
> + pkg_inject_files="$($(1)_INJECT_FILES)" \
> + pkg_source="$($(1)_DIR)"
> +
> +world/inject = \
> + $(call world/inject/env,$(strip $(1))) \
> + ptxd_make_world_inject
> +
> +# vim: syntax=make
> diff --git a/scripts/lib/ptxd_make_world_inject.sh
> b/scripts/lib/ptxd_make_world_inject.sh
> new file mode 100644
> index 000000000..c2e45ad42
> --- /dev/null
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -0,0 +1,42 @@
> +#!/bin/bash
> +#
> +# Copyright (C) 2021 by Michael Riesch <[email protected]>
> +#
> +# 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="${pkg_source}/$(echo ${inject_file} | cut -d ":" -f 2)"
> + if [ -z "${target}" ]; then
> + target="${source}"
> + fi
> +
> + 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 || break
'return' instead of 'break'
> +
> + for inject_file in ${pkg_inject_files}; do
> + ptxd_make_inject || break
same here. Otherwise, the failure won't be propagated. I missed that in the
last review but luckily it failed when I tested it because the barebox
version I used didn't have the target directory...
Michael
> + done
> +}
> +export -f ptxd_make_world_inject
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
> To unsubscribe, send a mail with subject "unsubscribe" to
> [email protected]
>
--
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
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
