From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 4/6] scripts: remove forked ptxd_make_world_inject.sh
Date: Mon, 16 Mar 2026 13:49:19 +0100 [thread overview]
Message-ID: <20260316124957.1223035-4-rhi@pengutronix.de> (raw)
In-Reply-To: <20260316124957.1223035-1-rhi@pengutronix.de>
Our changes got merged in PTXdist commit 6b2f811a0403948a5475
(2025-08-01, "ptxd_make_world_inject: create target path before
copying"), so we can remove our forked version of the script.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
scripts/lib/ptxd_make_world_inject.sh | 61 ---------------------------
1 file changed, 61 deletions(-)
delete 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
deleted file mode 100644
index a31184dced70..000000000000
--- a/scripts/lib/ptxd_make_world_inject.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/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})..."
- mkdir -p "$(dirname "${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.47.3
next prev parent reply other threads:[~2026-03-16 12:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-16 12:49 [DistroKit] [PATCH 1/6] v8a: sync platformconfig Roland Hieber
2026-03-16 12:49 ` [DistroKit] [PATCH 2/6] v8a: sync barebox-r5.config Roland Hieber
2026-03-16 12:49 ` [DistroKit] [PATCH 3/6] ptxdist: migrate 2025.11.0 -> 2026.03.0 with default options Roland Hieber
2026-03-16 12:49 ` Roland Hieber [this message]
2026-03-16 12:49 ` [DistroKit] [PATCH 5/6] kernel: remove forked recipe Roland Hieber
2026-03-16 12:49 ` [DistroKit] [PATCH 6/6] v8a: remove outdated barebox.rockchip.make Roland Hieber
2026-03-16 14:09 ` [DistroKit] [PATCH 1/6] v8a: sync platformconfig Robert Schwebel
2026-03-16 22:36 ` Roland Hieber
2026-03-16 23:44 ` [DistroKit] [PATCH] squash! kernel: remove forked recipe Roland Hieber
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=20260316124957.1223035-4-rhi@pengutronix.de \
--to=rhi@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