From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 30 Aug 2022 09:25:31 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oSvcp-001Tlg-20 for lore@lore.pengutronix.de; Tue, 30 Aug 2022 09:25:31 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oSvco-0000Qp-Ac; Tue, 30 Aug 2022 09:25:30 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oSvcW-0000QT-Bo; Tue, 30 Aug 2022 09:25:12 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oSvcV-002pFr-JP; Tue, 30 Aug 2022 09:25:11 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oSvcU-001nav-TP; Tue, 30 Aug 2022 09:25:10 +0200 Date: Tue, 30 Aug 2022 09:25:10 +0200 From: Michael Olbrich To: Christian Melki Message-ID: Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de References: <20220826133537.1843791-1-christian.melki@t2data.com> <20220826133537.1843791-3-christian.melki@t2data.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220826133537.1843791-3-christian.melki@t2data.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install. 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: 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.ext.pengutronix.de); SAEximRunCond expanded to false On Fri, Aug 26, 2022 at 03:35:37PM +0200, Christian Melki wrote: > This seems like a potential issue in several packages. > When signing u-boot images in tf-a, tf-a has u-boot as > a dependency. But u-boot doesn't install images to be processed > until targetinstall, which leads to problems. > > Some things might be targetinstall. But resulting images destined > for the imagedir aren't really targetinstall unless > they are also copied to rootfs. This is broken. 'ptxdist clean root' will remove the files from images/ and then only targetinstall is executed. So the files won't be copied again. If other packages need those files, then they must be copied to $(U_BOOT_PKGDIR) in the install stage. Michael > Signed-off-by: Christian Melki > --- > rules/u-boot.make | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/rules/u-boot.make b/rules/u-boot.make > index 0b632e8b2..bdbe03ffe 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -133,14 +133,7 @@ endif > > $(STATEDIR)/u-boot.install: > @$(call targetinfo) > - @$(call touch) > - > -# ---------------------------------------------------------------------------- > -# Target-Install > -# ---------------------------------------------------------------------------- > > -$(STATEDIR)/u-boot.targetinstall: > - @$(call targetinfo) > @$(call world/image-clean, U_BOOT) > ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_BIN > @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.bin) > @@ -194,6 +187,14 @@ ifndef PTXCONF_U_BOOT_ENV_IMAGE_NONE > @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot-env.img) > endif > > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/u-boot.targetinstall: > + @$(call targetinfo) > ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > @$(call install_init, u-boot) > @$(call install_fixup, u-boot, PRIORITY, optional) > -- > 2.34.1 > > > -- 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 |