From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 20 Jun 2022 08:20:43 +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 1o3Am9-007o3b-US for lore@lore.pengutronix.de; Mon, 20 Jun 2022 08:20:43 +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 1o3AmA-0004rS-LL; Mon, 20 Jun 2022 08:20:42 +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 1o3Akv-0004QI-6n; Mon, 20 Jun 2022 08:19:25 +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 1o3Aks-001afC-IB; Mon, 20 Jun 2022 08:19:23 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1o3Akt-006Fph-0W; Mon, 20 Jun 2022 08:19:23 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 20 Jun 2022 08:19:23 +0200 Message-Id: <20220620061923.1490786-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220609213328.3913523-1-christian.melki@t2data.com> References: <20220609213328.3913523-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] barebox: Simplify/cleanup barebox image installations. 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: Christian Melki 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 Thanks, applied as 4241dc8dc7bb69dce11a95b92ce835373f008759. Michael [sent from post-receive hook] On Mon, 20 Jun 2022 08:19:22 +0200, Christian Melki wrote: > Barebox has been carrying a descriptive barebox-flash-images file > for a while now. > This file contains the generated image files. > So instead of searching for images, let barebox tell us. > > Also remove some legacy image and environment handling. > This means that only Barebox >= 2015.12 is supported. > > Signed-off-by: Christian Melki > Message-Id: <20220609213328.3913523-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/barebox.make b/rules/barebox.make > index 753a47b595f0..e2ad43893a0e 100644 > --- a/rules/barebox.make > +++ b/rules/barebox.make > @@ -179,31 +179,16 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) > endif > > @$(call world/image-clean, BAREBOX) > - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ > - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort | while read image; do \ > - $(call ptx/image-install, BAREBOX, $$image); \ > - if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ > - $(call ptx/image-install-link, BAREBOX, `basename $$image`, barebox-image); \ > - fi; \ > - done; \ > - fi > - @if [ -e $(IMAGEDIR)/barebox-image ]; then \ > - :; \ > - elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ > - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox-flash-image, barebox-image); \ > - else \ > - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox.bin, barebox-image); \ > - fi > - @if [ -e $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env ]; then \ > - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env, \ > - barebox-default-environment); \ > - elif [ -e $(BAREBOX_BUILD_DIR)/common/barebox_default_env ]; then \ > - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/common/barebox_default_env, \ > - barebox-default-environment); \ > - elif [ -e $(BAREBOX_BUILD_DIR)/barebox_default_env ]; then \ > - $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox_default_env, \ > - barebox-default-environment); \ > - fi > + > + @$(foreach image, $(shell cat $(BAREBOX_BUILD_DIR)/barebox-flash-images), \ > + $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/$(image))$(ptx/nl) \ > + if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ > + $(call ptx/image-install-link, BAREBOX, $(notdir $(image)), barebox-image); \ > + fi$(ptx/nl)) > + > + @$(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env, \ > + barebox-default-environment) > + > @$(call touch) > > # ----------------------------------------------------------------------------