Hi Tomaz, On Mon, Feb 18, 2019 at 04:57:12PM +0100, Tomaz Solc wrote: > Commit 658af1ca mentions that environment build dependencies are not tracked > and the complete environment is rebuilt on every build. > > However commit 105201e0 added if_changed to the make rule, so this is currently > not the case. Environment is only rebuilt if barebox_default_env is missing or > if CONFIG_DEFAULT_ENVIRONMENT_PATH has changed. genenv is not re-run if any > individual source files are modified. So if environment source files are > edited, Barebox is rebuilt with a stale barebox_default_env unless it is > manually deleted first. > > With this commit genenv creates a .d file, similar to those created by gcc to > track C header dependencies. This is then passed to Kbuild with if_changed_dep > in the Makefile. This makes make re-run genenv if any source environment files are > changed. However, new environment files are still not detected automatically. Please try the attached patch. It should solve this issue once and for all. With this the environments are always built, but only if they have actually changed then the corresponding .S files are built. Sascha ------------------------------8<-------------------------------- >From 6c1275c02d9635ccdf7c263cbb3f853a20c670b3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Date: Wed, 20 Feb 2019 09:45:32 +0100 Subject: [PATCH] defaultenv: Fix dependencies The defaultenv should be rebuilt once a file in it has changed. the genenv script always generates the environment file to a temporary file. Only if it has changed to the last target file the temporary file is moved over the target file. This means we always have to call genenv, thus replace "if_changed" with "cmd". With this dependencies are correctly tracked. New or changed files result in new image builds whereas unchanged environments do not unnecessarily result in new images. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 7b8643bf57..561247ab34 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -325,7 +325,7 @@ quiet_cmd_env = ENV $@ cmd_env=$(srctree)/scripts/genenv $(srctree) $(objtree) $@ $< %.bbenv$(DEFAULT_COMPRESSION_SUFFIX): % FORCE - $(call if_changed,env) + $(call cmd,env) # Bzip2 # --------------------------------------------------------------------------- -- 2.20.1 -- 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@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
