From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Message-ID: <1350372903.3207.0.camel@lws-weitzel>
From: Jan Weitzel <J.Weitzel@phytec.de>
Date: Tue, 16 Oct 2012 09:35:03 +0200
In-Reply-To: <1350316391-10969-1-git-send-email-jlu@pengutronix.de>
References: <1350316391-10969-1-git-send-email-jlu@pengutronix.de>
Mime-Version: 1.0
Subject: Re: [ptxdist] [PATCH] barebox: support new location of
 barebox_default_env
Reply-To: ptxdist@pengutronix.de, J.Weitzel@phytec.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
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 <jlu@pengutronix.de>

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