From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Jan Luebbe Date: Mon, 15 Oct 2012 17:53:11 +0200 Message-Id: <1350316391-10969-1-git-send-email-jlu@pengutronix.de> Subject: [ptxdist] [PATCH] barebox: support new location of barebox_default_env Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Jan Luebbe Since barebox v2012.10.0, barebox_default_env has moved to common/. Signed-off-by: Jan Luebbe --- 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