From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] barebox: Simplify/cleanup barebox image installations.
Date: Mon, 20 Jun 2022 08:19:23 +0200 [thread overview]
Message-ID: <20220620061923.1490786-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220609213328.3913523-1-christian.melki@t2data.com>
Thanks, applied as 4241dc8dc7bb69dce11a95b92ce835373f008759.
Michael
[sent from post-receive hook]
On Mon, 20 Jun 2022 08:19:22 +0200, Christian Melki <christian.melki@t2data.com> 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 <christian.melki@t2data.com>
> Message-Id: <20220609213328.3913523-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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)
>
> # ----------------------------------------------------------------------------
prev parent reply other threads:[~2022-06-20 6:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-09 21:33 [ptxdist] [PATCH v2 1/2] " Christian Melki
2022-06-09 21:33 ` [ptxdist] [PATCH v2 2/2] barebox: Add option to install barebox generated dtbs Christian Melki
2022-06-20 6:19 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-06-20 6:19 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220620061923.1490786-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox