From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 12 May 2024 15:17:52 +0200 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 1s695M-00Avz2-2J for lore@lore.pengutronix.de; Sun, 12 May 2024 15:17:52 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1s695M-0004hf-2o; Sun, 12 May 2024 15:17:52 +0200 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 1s694G-0002hG-6g; Sun, 12 May 2024 15:16:44 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1s694F-000zYe-Qa; Sun, 12 May 2024 15:16:43 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1s694F-00FXVh-2W; Sun, 12 May 2024 15:16:43 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sun, 12 May 2024 15:16:43 +0200 Message-Id: <20240512131643.3703726-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240506105051.323546-5-ada@thorsis.com> References: <20240506105051.323546-5-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Introduce new variable _INJECT_OOT X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as d4caaae5e1e35470f24b8b3da79aa77b57c4deb6. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:43 +0200, Alexander Dahl wrote: > Setting the new variable to 'YES' allows to inject into _BUILD_DIR > instead of _DIR as before. > > When building out-of-tree some bootloaders like U-Boot expect injected > files in the build dir, not in the source dir. Backwards compatibility > is ensured, the source dir is still the default, the new inject dest is > optional and in case set it overwrites the default. > > For using this in u-boot package, on top of the things already done to > use the old inject mechanism in general, add this line to > 'rules/u-boot.make' for example: > > U_BOOT_INJECT_OOT := YES > > Signed-off-by: Alexander Dahl > Acked-by: Michael Riesch > Message-Id: <20240506105051.323546-5-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/post/ptxd_make_world_inject.make b/rules/post/ptxd_make_world_inject.make > index eabcdd0529b8..1e3979a2f007 100644 > --- a/rules/post/ptxd_make_world_inject.make > +++ b/rules/post/ptxd_make_world_inject.make > @@ -9,7 +9,8 @@ > world/inject/env = \ > $(call world/env, $(1)) \ > pkg_inject_path="$(call ptx/escape,$($(1)_INJECT_PATH))" \ > - pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))" > + pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))" \ > + pkg_inject_oot="$(call ptx/escape,$($(1)_INJECT_OOT))" > > world/inject = \ > $(call world/inject/env,$(strip $(1))) \ > diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh > index b74e464c6895..e8e94fbe6397 100644 > --- a/scripts/lib/ptxd_make_world_inject.sh > +++ b/scripts/lib/ptxd_make_world_inject.sh > @@ -10,7 +10,7 @@ ptxd_make_inject() { > local source target > > source="$(echo ${inject_file} | cut -d ":" -f 1)" > - target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)" > + target="${inject_dest}/$(echo ${inject_file} | cut -d ":" -f 2)" > > if [[ "${source}" =~ ^/.* ]]; then > ptxd_bailout "'${source}' must not be an absolute path!" \ > @@ -32,8 +32,25 @@ export -f ptxd_make_inject > ptxd_make_world_inject() { > ptxd_make_world_init || return > > - if [ -z "${pkg_dir}" ]; then > - ptxd_bailout "_DIR empty, no destination to inject to." > + 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