From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/1] barebox_default_env: fix out of tree build
Date: Fri, 23 Jul 2010 08:21:45 +0200 [thread overview]
Message-ID: <20100723062144.GN14113@pengutronix.de> (raw)
In-Reply-To: <1279724722-31325-1-git-send-email-plagnioj@jcrosoft.com>
Hi Jean Christophe,
Applied to -next.
Thanks
Sascha
On Wed, Jul 21, 2010 at 05:05:22PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> common/Makefile | 8 +++++---
> scripts/genenv | 8 +++++---
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/common/Makefile b/common/Makefile
> index 8b8686d..14f8643 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -26,6 +26,8 @@ ENV_FILES := $(shell cd $(srctree); for i in $(CONFIG_DEFAULT_ENVIRONMENT_PATH);
>
> endif # ifdef CONFIG_DEFAULT_ENVIRONMENT
>
> -include/barebox_default_env.h: $(ENV_FILES)
> - $(Q)scripts/genenv $(srctree) $(CONFIG_DEFAULT_ENVIRONMENT_PATH)
> - $(Q)cat barebox_default_env | scripts/bin2c default_environment > $@
> +barebox_default_env: $(ENV_FILES)
> + $(Q)$(srctree)/scripts/genenv $(srctree) $(objtree) $(CONFIG_DEFAULT_ENVIRONMENT_PATH)
> +
> +include/barebox_default_env.h: barebox_default_env
> + $(Q)cat $< | $(objtree)/scripts/bin2c default_environment > $@
> diff --git a/scripts/genenv b/scripts/genenv
> index 6a833b1..de8b4f1 100755
> --- a/scripts/genenv
> +++ b/scripts/genenv
> @@ -1,17 +1,19 @@
> #!/bin/bash
>
> # Generate the default environment file from a list of directories
> -# usage: genenv <basedir> <dir>...
> +# usage: genenv <basedir> <objdir> <dir>...
> # where <basedir> is the base directory for relative pathes in <dir>
> +# where <objdir> is the base directory for relative pathes for result
> +objtree=$2
> cd $1 || exit 1
> -shift
> +shift 2
>
> tempdir=$(mktemp -d)
>
> for i in $*; do
> cp -r $i/* $tempdir
> done
> -scripts/bareboxenv -s $tempdir barebox_default_env
> +$objtree/scripts/bareboxenv -s $tempdir $objtree/barebox_default_env
>
> rm -r $tempdir
>
> --
> 1.7.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2010-07-23 6:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-21 15:05 Jean-Christophe PLAGNIOL-VILLARD
2010-07-23 6:21 ` Sascha Hauer [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=20100723062144.GN14113@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=plagnioj@jcrosoft.com \
/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