From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 26 Aug 2024 14:09:55 +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 1siYXj-00DZz9-0a for lore@lore.pengutronix.de; Mon, 26 Aug 2024 14:09:55 +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 1siYXi-0003eO-2u; Mon, 26 Aug 2024 14:09:54 +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 1siYXa-0003e1-Sk for ptxdist@pengutronix.de; Mon, 26 Aug 2024 14:09:46 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.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 1siYXa-003BTv-G1 for ptxdist@pengutronix.de; Mon, 26 Aug 2024 14:09:46 +0200 Received: from rhi by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1siYXa-0073yK-1H for ptxdist@pengutronix.de; Mon, 26 Aug 2024 14:09:46 +0200 Date: Mon, 26 Aug 2024 14:09:46 +0200 From: Roland Hieber To: ptxdist@pengutronix.de Message-ID: <20240826120946.2ntx76punhtffg6o@pengutronix.de> References: <20240802102529.1411407-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [ptxdist] [PATCH 1/2] barebox: remove superfluous ptxd_source_kconfig calls 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 On Thu, Aug 08, 2024 at 04:14:41PM +0200, Michael Olbrich wrote: > On Fri, Aug 02, 2024 at 12:25:28PM +0200, Roland Hieber wrote: > > These calls make the PTXCONF_* variables from the ptxconfig and the > > platformconfig available in the local shell environment, but no PTXCONF_ > > variable is used later in the shell call. This is probably a left-over > > from when the defaultenv preparation was made layer-aware in commit > > 41cb4d9f9287d85ae11b (2018-07-24, Michael Olbrich: "barebox: support > > layers with BAREBOX_EXTRA_ENV_PATH"). > > No, this is wrong. ptxd_filter_dir will replace and @VARIABLE@ and the > files can come from the BSP and can contain @PTXCONF_*@ patterns that > should be replaces. Okay. The two other patches should still apply without this one. - Roland > > Michael > > > Signed-off-by: Roland Hieber > > --- > > rules/barebox.make | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/rules/barebox.make b/rules/barebox.make > > index c0d9c5744e4a..bcb96e607b91 100644 > > --- a/rules/barebox.make > > +++ b/rules/barebox.make > > @@ -87,9 +87,7 @@ endif > > > > ifdef PTXCONF_BAREBOX_EXTRA_ENV > > @rm -rf $(BAREBOX_BUILD_DIR)/.ptxdist-defaultenv > > - @ptxd_source_kconfig "${PTXDIST_PTXCONFIG}" && \ > > - ptxd_source_kconfig "${PTXDIST_PLATFORMCONFIG}" && \ > > - $(foreach path, $(BAREBOX_EXTRA_ENV_PATH), \ > > + @$(foreach path, $(BAREBOX_EXTRA_ENV_PATH), \ > > if [ -d "$(path)" ]; then \ > > ptxd_filter_dir "$(path)" \ > > $(BAREBOX_BUILD_DIR)/.ptxdist-defaultenv; \ > > -- > > 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 | > > -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |