* [ptxdist] [PATCH] barebox: support new location of barebox_default_env
@ 2012-10-15 15:53 Jan Luebbe
2012-10-16 7:35 ` Jan Weitzel
0 siblings, 1 reply; 3+ messages in thread
From: Jan Luebbe @ 2012-10-15 15:53 UTC (permalink / raw)
To: ptxdist; +Cc: Jan Luebbe
Since barebox v2012.10.0, barebox_default_env has moved to common/.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
rules/barebox.make | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rules/barebox.make b/rules/barebox.make
index d16abda..ae00503 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -125,7 +125,11 @@ ifdef PTXCONF_BAREBOX_BAREBOXENV
@$(call install_finish, barebox)
endif
@install -D -m644 $(BAREBOX_DIR)/barebox.bin $(IMAGEDIR)/barebox-image
- @install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment
+ @if [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \
+ install -D -m644 $(BAREBOX_DIR)/common/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
+ else \
+ install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
+ fi
@$(call touch)
# ----------------------------------------------------------------------------
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] barebox: support new location of barebox_default_env
2012-10-15 15:53 [ptxdist] [PATCH] barebox: support new location of barebox_default_env Jan Luebbe
@ 2012-10-16 7:35 ` Jan Weitzel
2012-10-16 8:36 ` Jan Lübbe
0 siblings, 1 reply; 3+ messages in thread
From: Jan Weitzel @ 2012-10-16 7:35 UTC (permalink / raw)
To: ptxdist; +Cc: Jan Luebbe
Am Montag, den 15.10.2012, 17:53 +0200 schrieb Jan Luebbe:
> Since barebox v2012.10.0, barebox_default_env has moved to common/.
its on master now, will be in v2012.11.0
Jan
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> ---
> rules/barebox.make | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/rules/barebox.make b/rules/barebox.make
> index d16abda..ae00503 100644
> --- a/rules/barebox.make
> +++ b/rules/barebox.make
> @@ -125,7 +125,11 @@ ifdef PTXCONF_BAREBOX_BAREBOXENV
> @$(call install_finish, barebox)
> endif
> @install -D -m644 $(BAREBOX_DIR)/barebox.bin $(IMAGEDIR)/barebox-image
> - @install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment
> + @if [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \
> + install -D -m644 $(BAREBOX_DIR)/common/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
> + else \
> + install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
> + fi
> @$(call touch)
>
> # ----------------------------------------------------------------------------
> --
> 1.7.10.4
>
>
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] barebox: support new location of barebox_default_env
2012-10-16 7:35 ` Jan Weitzel
@ 2012-10-16 8:36 ` Jan Lübbe
0 siblings, 0 replies; 3+ messages in thread
From: Jan Lübbe @ 2012-10-16 8:36 UTC (permalink / raw)
To: J.Weitzel; +Cc: ptxdist
On Tue, 2012-10-16 at 09:35 +0200, Jan Weitzel wrote:
> Am Montag, den 15.10.2012, 17:53 +0200 schrieb Jan Luebbe:
> > Since barebox v2012.10.0, barebox_default_env has moved to common/.
> its on master now, will be in v2012.11.0
Yes, you're right. Applying it now shouldn't cause problems, though.
Regards,
Jan
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-16 8:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-15 15:53 [ptxdist] [PATCH] barebox: support new location of barebox_default_env Jan Luebbe
2012-10-16 7:35 ` Jan Weitzel
2012-10-16 8:36 ` Jan Lübbe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox