From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 16 Mar 2026 13:50:03 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1w27OV-001R6e-2I for lore@lore.pengutronix.de; Mon, 16 Mar 2026 13:50:03 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1w27OU-0007Ns-TY; Mon, 16 Mar 2026 13:50:02 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1w27OS-0007M0-MJ; Mon, 16 Mar 2026 13:50:00 +0100 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac] helo=dude04) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1w27OS-000ZXG-1Y; Mon, 16 Mar 2026 13:50:00 +0100 Received: from rhi by dude04 with local (Exim 4.98.2) (envelope-from ) id 1w27OS-000000058Bc-1lsf; Mon, 16 Mar 2026 13:50:00 +0100 From: Roland Hieber To: distrokit@pengutronix.de Date: Mon, 16 Mar 2026 13:49:19 +0100 Message-ID: <20260316124957.1223035-4-rhi@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260316124957.1223035-1-rhi@pengutronix.de> References: <20260316124957.1223035-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 4/6] scripts: remove forked ptxd_make_world_inject.sh X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- 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 -# -# 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 _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 "_INJECT_OOT: please set to YES or NO" ;; - esac - - if [ "${pkg_build_oot:-NO}" = 'NO' ] && [ "${pkg_inject_oot}" != 'NO' ]; then - ptxd_warning "_BUILD_OOT and _INJECT_OOT contradict each other." \ - "Using $(ptxd_print_path ${inject_dest}) as inject destination anyways." - fi - - if [ ! -d "${inject_dest}" ]; then - ptxd_bailout " inject destination dir missing." \ - "Correct placement of world/inject depends on _BUILD_OOT and _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