mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v2] environment generation: Fix dependencies
Date: Fri, 28 Sep 2012 10:29:30 +0200	[thread overview]
Message-ID: <20120928082930.GH26553@game.jcrosoft.org> (raw)
In-Reply-To: <1348819477-22665-1-git-send-email-s.hauer@pengutronix.de>

On 10:04 Fri 28 Sep     , Sascha Hauer wrote:
> The dependencies for generating the environment do not work properly:
> 
> - If files are removed from the defaultenv, a subsequent make will not
>   update the default environment.
> - If CONFIG_DEFAULT_ENVIRONMENT_PATH changes, the default environment
>   also will not be regenerated.
> 
> This patch fixes this by introducing a cmd_env which has the content of
> $(ENV_FILES) in the command so that the if_changed mechanism recognizes
> a change when $(ENV_FILE) changes. This also results in a nice "  ENV "
> string in the build process.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> 
> changes since v1:
> 
> - fix out of tree building
> 
>  Makefile        |    2 +-
>  common/Makefile |   28 ++++++++++++++++++++--------
>  scripts/genenv  |   17 +++++++++++------
>  3 files changed, 32 insertions(+), 15 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 0f1a319..af5c036 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1013,7 +1013,7 @@ endif # CONFIG_MODULES
>  CLEAN_DIRS  += $(MODVERDIR)
>  CLEAN_FILES +=	barebox System.map include/generated/barebox_default_env.h \
>                  .tmp_version .tmp_barebox* barebox.bin barebox.map barebox.S \
> -		.tmp_kallsyms* barebox_default_env* barebox.ldr \
> +		.tmp_kallsyms* common/barebox_default_env* barebox.ldr \
>  		scripts/bareboxenv-target barebox-flash-image \
>  		Doxyfile.version barebox.srec barebox.s5p
>  
> diff --git a/common/Makefile b/common/Makefile
> index 9eda98c..b74c76b 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -39,6 +39,7 @@ obj-$(CONFIG_PASSWORD) += password.o
>  obj-$(CONFIG_MODULES) += module.o
>  obj-$(CONFIG_FLEXIBLE_BOOTARGS) += bootargs.o
>  extra-$(CONFIG_MODULES) += module.lds
> +extra-y += barebox_default_env
>  
>  ifdef CONFIG_DEFAULT_ENVIRONMENT
>  $(obj)/startup.o: include/generated/barebox_default_env.h
> @@ -63,8 +64,19 @@ ENV_FILES := $(shell cd $(srctree); for i in $(DEFAULT_ENVIRONMENT_PATH); do fin
>  
>  endif # ifdef CONFIG_DEFAULT_ENVIRONMENT
>  
> -barebox_default_env: $(ENV_FILES)
> -	$(Q)$(srctree)/scripts/genenv $(srctree) $(objtree) $(DEFAULT_ENVIRONMENT_PATH)
> +#
> +# Generate a barebox envfs image.
> +#
> +# echo $(ENV_FILES) > /dev/null is just for letting if_changed
> +# recognize that something has changed when the environment has
> +# other files,
> +#
> +quiet_cmd_env = ENV     $@
> +cmd_env = ($(srctree)/scripts/genenv $(srctree) $(objtree) $@ $(DEFAULT_ENVIRONMENT_PATH)) || \
> +	(echo $(ENV_FILES) > /dev/null; rm -f $@ ; false)
> +
> +$(obj)/barebox_default_env: $(ENV_FILES) FORCE
> +	$(call if_changed,env)
>  
>  barebox_default_env_comp =
>  ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_COMPRESSED_GZIP),y)
> @@ -77,18 +89,18 @@ ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_COMPRESSED_LZO),y)
>  barebox_default_env_comp = .lzo
>  endif
>  
> -barebox_default_env.gz: barebox_default_env
> +$(obj)/barebox_default_env.gz: $(obj)/barebox_default_env
>  	$(call if_changed,gzip)
>  
> -barebox_default_env.bz2: barebox_default_env
> +$(obj)/barebox_default_env.bz2: $(obj)/barebox_default_env
>  	$(call if_changed,bzip2)
>  
> -barebox_default_env.lzo: barebox_default_env
> +$(obj)/barebox_default_env.lzo: $(obj)/barebox_default_env
>  	$(call if_changed,lzo)
>  
> -include/generated/barebox_default_env.h: barebox_default_env$(barebox_default_env_comp)
> -	$(Q)cat $< | $(objtree)/scripts/bin2c default_environment > $@
> -	$(Q)echo "const int default_environment_uncompress_size=`stat -c%s barebox_default_env`;" >> $@
> +include/generated/barebox_default_env.h: $(obj)/barebox_default_env$(barebox_default_env_comp)
> +	$(Q)cat $< | (cd $(obj) && $(objtree)/scripts/bin2c default_environment) > $@
> +	$(Q)echo "const int default_environment_uncompress_size=`stat -c%s $(obj)/barebox_default_env`;" >> $@
just one comment I was think to drop the header and use a piggy data instead

and also maybe drop the bareboxenv for an other fs or switch bareboxenv to fs
so we can use want we want as env

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2012-09-28  8:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-28  8:04 Sascha Hauer
2012-09-28  8:29 ` Jean-Christophe PLAGNIOL-VILLARD [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=20120928082930.GH26553@game.jcrosoft.org \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@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