9
0
Fork 0
Commit Graph

8 Commits

Author SHA1 Message Date
Sascha Hauer 90d92b359d Merge branch 'for-next/defaultenv-deps' 2012-10-03 21:18:10 +02:00
Sascha Hauer c8c49c14ae environment generation: Fix dependencies
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>
2012-09-28 16:21:44 +02:00
Jean-Christophe PLAGNIOL-VILLARD 453c220be3 genenv: Allow to also specify files for the environment instead of only directories
we may specify file in the defconfig

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-09-11 13:43:10 +02:00
Dirk Hörner 4024d9ca11 scripts/genenv: always pass template to mktemp
Passing a template to mktemp is mandatory on OS X.

Signed-off-by: Dirk Hörner <dirker@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-06-05 21:40:15 +02:00
Hubert Feurstein ede81aae82 scripts/getenv: delete backup files from enviroment directory
Also add the '--no-run-if-empty' option to xargs to avoid an
error message when no files/folders were found.

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-06-01 19:43:28 +02:00
Tim Sander 2fac6eb5c8 fix genenv when using svn based enviroment directory
Hi

When setting the default env of barebox to a svn directory the build stops
with questions on removal and the barebox env is polluted with svn files.

The patch below fixes that.

Tested with 2011.03.1. Newer versions don't boot anymore on my pcm043 :-(.

Signed-off-by: Tim Sander <tim.sander@hbm.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-05-23 10:26:59 +02:00
Jean-Christophe PLAGNIOL-VILLARD d879de38e8 barebox_default_env: fix out of tree build
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-07-22 15:49:02 +02:00
Sascha Hauer 600c0e987e Allow to merge default environment from more than one directory
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-06-22 15:44:40 +02:00