From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 03 May 2024 18:05:53 +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 1s2vQ1-0002jS-0c for lore@lore.pengutronix.de; Fri, 03 May 2024 18:05:53 +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 1s2vQ0-0007xP-Hb; Fri, 03 May 2024 18:05:52 +0200 Received: from mail.thorsis.com ([2003:a:e28:26e4::10]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s2vPe-0007vz-PI for ptxdist@pengutronix.de; Fri, 03 May 2024 18:05:33 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A96681483429; Fri, 3 May 2024 18:05:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=dkim; t=1714752328; h=from:subject:date:message-id:to:mime-version:content-type:in-reply-to: references; bh=dyNArdiiwitdqIycud6tund8ynGe1ggfA+3i/8mtXkA=; b=N3Mjxjx+vy8VijL8yeXBPJMfJV14BoHosHpzKyxoSoalfSdAYQ7o0hkSte+Gz5RxLM1DXf NWNfSysTWhhWs6HU5wWm//KvQfpTkTLT+9HLCIRZv54gqPzxtPyePKzMUyZf/corZOYwwx ZNA+zE0bqt9Ytvy6qKHhNnxOhwNBR1r59QlIFKX8pVtSARV4/uMGTzwhmYAWcLE5YPCNYc gOvVVm5JiU9PM+rhpEkg7Yz/1JUqNhbdec4j08j8K37zvA5zzwbovrspZfLqKbzkfLAJyj MXFnhaCgfx7XB41n/Qftuz9c9qSXU8X3prwXbuGnhBpJofS80h69aq1jlxMhFw== Date: Fri, 3 May 2024 18:05:20 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de, Michael Riesch Message-ID: <20240503-stammer-deduce-a0cbf8e72e7d@thorsis.com> Mail-Followup-To: ptxdist@pengutronix.de, Michael Riesch References: <20240424143109.277373-1-ada@thorsis.com> <20240424143109.277373-5-ada@thorsis.com> <20240503-washtub-gumball-aefbf8984faf@thorsis.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.2.12 (2023-09-09) X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH 4/4] ptxd_make_world_inject: Introduce separate destination directory 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 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 Hello Michael, Am Fri, May 03, 2024 at 05:31:29PM +0200 schrieb Michael Olbrich: > On Fri, May 03, 2024 at 12:08:34PM +0200, Alexander Dahl wrote: > > Am Fri, May 03, 2024 at 11:48:52AM +0200 schrieb Michael Olbrich: > > > On Wed, Apr 24, 2024 at 04:31:09PM +0200, Alexander Dahl wrote: > > > > Setting the optional _INJECT_DEST now allows to give a different > > > > target for putting the binary blobs into. 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 inject mechanism in general, add this line to > > > > 'rules/u-boot.make' for example: > > > > > > > > U_BOOT_INJECT_DEST := $(U_BOOT_BUILD_DIR) > > > > > > Can you add a patch for u-boot? > > > > I will, in an upcoming patch series with more changes to the u-boot > > package. Planned to this after lunch later today anyways. ^^ > > > > > > > > > > Signed-off-by: Alexander Dahl > > > > --- > > > > rules/post/ptxd_make_world_inject.make | 3 ++- > > > > scripts/lib/ptxd_make_world_inject.sh | 22 ++++++++++++++++++---- > > > > 2 files changed, 20 insertions(+), 5 deletions(-) > > > > > > > > diff --git a/rules/post/ptxd_make_world_inject.make b/rules/post/ptxd_make_world_inject.make > > > > index eabcdd052..509d480ba 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_dest="$(call ptx/escape,$($(1)_INJECT_DEST))" > > > > > > > > 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 b74e464c6..90bd8b684 100644 > > > > --- a/scripts/lib/ptxd_make_world_inject.sh > > > > +++ b/scripts/lib/ptxd_make_world_inject.sh > > > > @@ -7,10 +7,15 @@ > > > > # > > > > > > > > ptxd_make_inject() { > > > > - local source target > > > > + local dest source target > > > > + > > > > + dest="${pkg_dir}" > > > > + if [ -n "${pkg_inject_dest}" ]; then > > > > + dest="${pkg_inject_dest}" > > > > + fi > > > > > > This should be in ptxd_make_world_inject(). It remains the same for all > > > files. > > > > I thought about this when changing it, but decided to keep it at this > > place. Moving it to ptxd_make_world_inject() would require to > > introduce another non-local variable and I did not want that. But > > sure, can be done. > > Just set pkg_inject_dest if it's empty. No need for a separate variable. Ack. > > > > source="$(echo ${inject_file} | cut -d ":" -f 1)" > > > > - target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)" > > > > + target="${dest}/$(echo ${inject_file} | cut -d ":" -f 2)" > > > > > > > > if [[ "${source}" =~ ^/.* ]]; then > > > > ptxd_bailout "'${source}' must not be an absolute path!" \ > > > > @@ -32,8 +37,17 @@ 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_dest}" ] && [ -z "${pkg_dir}" ]; then > > > > + ptxd_bailout "No destination to inject to." \ > > > > + "Set either _DIR or _INJECT_DEST to have a valid destination!" > > > > + fi > > > > + > > > > + if [ -n "${pkg_inject_dest}" ]; then > > > > + if [ "${pkg_build_dir}" = "${pkg_inject_dest}" ] && [ "${pkg_build_oot}" = "YES" ]; then > > > > > > This gives a warning even in the good case, right? > > > > No it does not. In the good case user has set either _DIR or > > _INJECT_DEST to a not empty string and the bailout does not > > happen. > > > > The warning inside this more complicated if statement is just covering > > this one edge case which I ran into when developing, and the text > > should describe what happens, why the user would not find the files in > > _BUILD_DIR in that case. > > Still, for u-boot the warning will always be visible right? That's not > nice. No, it is not always visible. Warning is only visible if _BUILD_OOT is set to 'YES'. For u-boot this is actually never the case, because there it's either 'KEEP' or 'NO'. But the code is generic, thus the warning for this edge case. When testing this I had exactly that case: inject destination set to build dir and build_oot set to 'YES' and then I wondered where the files are. They get deleted by some other ptxdist script magic because the whole build_dir is removed before it is recreated again. Not sure in what stage though, but this is a thing 'KEEP' is preventing. > > The mkdir is only dependend on _INJECT_DEST set, because there's > > no need to create that dir if the feature is not used. > > Setting _INJECT_DEST to anything other than pkg_dir or pkg_build_dir > does not really make sense. The whole point of this is, to copy files > there. > Hmmm, maybe we should make that explicit: > > _INJECT_OOT := YES This is nice, I really like that. > Or something else that indicates that the pkg_build_dir should be used. So > don't make it more flexible than needed. > > And then you can definitely check for the directory existence to determine > if the order was correct. Will check the implications of that next week. > > > I think we should require that pkg_inject_dest already exists at > > > this point and fail if it does not. > > > > This would move the responsibility to create that dir to the package > > author. I opted against that, because _DIR and _BUILD_DIR > > are also implicitly created by ptxdist, no need to create those in the > > make rules. This is a question of policy, but it would make the > > inject mechanism somewhat asymmetric if _DIR (for when > > _INJECT_DEST is not set) has not to be created by the package author > > but _INJECT_DEST has to. > > For pkg_build_dir there are clear rules, when it's created: during > world/prepare. I think it's fine to require that. Or world/execute for a > custom prepare command. u-boot should actually use that. Well, I'll look into that again after reworking the destination folder thing, next week. Thanks for your input and have a nice weekend. Greets Alex > > > Again: sure, can be done if desired. > > > > Let me know if I should change the pieces or if my explanations made > > sense and things can be kept like this? > > Michael > > > > > + ptxd_warning "_INJECT_DEST is set to _BUILD_DIR and _BUILD_OOT is set to 'YES'." \ > > > > + "If you called world/inject before world/prepare your files will be removed after injecting." > > > > + fi > > > > + mkdir -p -- "${pkg_inject_dest}" > > > > fi > > > > > > > > for inject_file in ${pkg_inject_files}; do > > > > -- > > > > 2.39.2 > > > > > > > > > > > > > > > > > > -- > > > Pengutronix e.K. | | > > > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > > > > > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | >