From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Riesch <michael.riesch@wolfvision.net>
Subject: Re: [ptxdist] [APPLIED] scripts: add helper to inject files into a source directory
Date: Sun, 30 Jan 2022 16:49:48 +0100 [thread overview]
Message-ID: <20220130154948.9433-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220129070330.2601433-4-michael.riesch@wolfvision.net>
Thanks, applied as 3ca92677df5bbde0fb01c396acb0ffc64f26fc2b.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:48 +0100, Michael Riesch <michael.riesch@wolfvision.net> 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 <michael.riesch@wolfvision.net>
> Message-Id: <20220129070330.2601433-4-michael.riesch@wolfvision.net>
> 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
> new file mode 100644
> index 000000000000..b7d28e92f25b
> --- /dev/null
> +++ b/rules/post/ptxd_make_world_inject.make
> @@ -0,0 +1,19 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2021 by Michael Riesch <michael.riesch@wolfvision.net>
> +#
> +# 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 000000000000..fe4eb8363619
> --- /dev/null
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -0,0 +1,42 @@
> +#!/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="${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 || return
> +
> + for inject_file in ${pkg_inject_files}; do
> + ptxd_make_inject || return
> + done
> +}
> +export -f ptxd_make_world_inject
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2022-01-30 15:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-29 7:03 [ptxdist] [PATCH v6 0/5] Add support for Rockchip firmware blobs Michael Riesch
2022-01-29 7:03 ` [ptxdist] [PATCH v6 1/5] platforms: add section for non-free " Michael Riesch
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-29 7:03 ` [ptxdist] [PATCH v6 2/5] add package for rockchip firmware binaries Michael Riesch
2022-01-29 7:03 ` [ptxdist] [PATCH v6 3/5] scripts: add helper to inject files into a source directory Michael Riesch
2022-01-30 15:49 ` Michael Olbrich [this message]
2024-04-19 9:48 ` Alexander Dahl
2024-05-02 10:08 ` Michael Olbrich
2024-04-23 13:52 ` Alexander Dahl
2024-04-23 16:27 ` Michael Riesch
2022-01-29 7:03 ` [ptxdist] [PATCH v6 4/5] barebox: add integration of firmware blobs Michael Riesch
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-29 7:03 ` [ptxdist] [RFC PATCH v6 5/5] barebox.rockchip: add binary firmware blobs for quartz64 and rk3568-evb1 Michael Riesch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220130154948.9433-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=michael.riesch@wolfvision.net \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox