DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Lars Schmidt <l.schmidt@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Lars Schmidt <l.schmidt@pengutronix.de>
Subject: [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist
Date: Fri,  1 Aug 2025 11:14:55 +0200	[thread overview]
Message-ID: <20250801091456.582976-2-l.schmidt@pengutronix.de> (raw)
In-Reply-To: <20250801091456.582976-1-l.schmidt@pengutronix.de>

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.

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




  reply	other threads:[~2025-08-01  9:15 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-31 15:51 [DistroKit] [PATCH] v8a: barebox: version bump 2025.06.1 -> 2025.07.0 Lars Schmidt
2025-07-31 19:02 ` Robert Schwebel
2025-08-01  9:14 ` [DistroKit] [PATCH 1/3] fixup! " Lars Schmidt
2025-08-01  9:14   ` Lars Schmidt [this message]
2025-08-01  9:29     ` [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist Alexander Dahl
2025-08-01 12:01       ` [DistroKit] [PATCH 1/2] " Lars Schmidt
2025-08-01 12:01         ` [DistroKit] [PATCH 2/2] scripts: create target path in ptxd_make_world_inject Lars Schmidt
2025-08-02  5:38           ` Robert Schwebel
2025-08-01  9:14   ` [DistroKit] [PATCH 3/3] " Lars Schmidt

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=20250801091456.582976-2-l.schmidt@pengutronix.de \
    --to=l.schmidt@pengutronix.de \
    --cc=distrokit@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