On Wed, Feb 20, 2019 at 12:14:43PM +0100, Tomaž Šolc wrote: > Hi Sascha, > > On 20. 02. 19 09:57, Sascha Hauer wrote: > > Hi Tomaz, > > > > On Mon, Feb 18, 2019 at 04:57:12PM +0100, Tomaz Solc wrote: > > > 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. > > Unfortunately with your patch the final image still gets rebuilt with a > stale environment unless I delete defaultenv/barebox_default_env. > > See transcript bellow, where I'm using your patch. I modify one environment > file for Raspberry Pi. After just calling "make", the image doesn't include > the change. Right, I missed the environment snippet that is generated from CONFIG_DEFAULT_ENVIRONMENT_PATH which is generated at a different place. Please try this updated patch. Sascha -----------------------------------8<------------------------------- >From c41a478e59a74b66a3de5c597224f02e0b39fa12 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> --- defaultenv/Makefile | 2 +- scripts/Makefile.lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaultenv/Makefile b/defaultenv/Makefile index f313b04e84..03b329c4dd 100644 --- a/defaultenv/Makefile +++ b/defaultenv/Makefile @@ -14,7 +14,7 @@ quiet_cmd_env_default = ENV $@ cmd_env_default = ($(srctree)/scripts/genenv $(srctree) $(objtree) $@ $(CONFIG_DEFAULT_ENVIRONMENT_PATH)) $(obj)/barebox_default_env: FORCE - $(call if_changed,env_default) + $(call cmd,env_default) quiet_cmd_env_h = ENVH $@ cmd_env_h = cat $< | (cd $(obj) && $(objtree)/scripts/bin2c "__aligned(4) default_environment") > $@; \ 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
