mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Jan Luebbe <jlu@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Jan Luebbe <jlu@pengutronix.de>
Subject: [ptxdist] [PATCH] barebox: support new location of barebox_default_env
Date: Mon, 15 Oct 2012 17:53:11 +0200	[thread overview]
Message-ID: <1350316391-10969-1-git-send-email-jlu@pengutronix.de> (raw)

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

             reply	other threads:[~2012-10-15 15:53 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-15 15:53 Jan Luebbe [this message]
2012-10-16  7:35 ` Jan Weitzel
2012-10-16  8:36   ` Jan Lübbe

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=1350316391-10969-1-git-send-email-jlu@pengutronix.de \
    --to=jlu@pengutronix.de \
    --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