| Message ID | 1428031825-13573-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 04/02/2015 09:30 PM, Masahiro Yamada wrote: > Since the Kconfig conversion, config.mk has been included only when > include/config/auto.conf is newer than the .config file. > > It causes build error if both files have the same time-stamps. > It is actually possible because EXT* file systems have a 1s time-stamp > resolution. > > The config.mk should be included when include/config/auto.conf is > *not older* than the .config file. Tested-by: Stephen Warren <swarren@nvidia.com> I ran a loop of 941 "MAKEALL rpi_2" during a meeting without issue. I also applied the same patch to a tree that had the timestamps set in a way that triggered the problem, and it immediately solved it there.
On Fri, Apr 03, 2015 at 12:30:25PM +0900, Masahiro Yamada wrote: > Since the Kconfig conversion, config.mk has been included only when > include/config/auto.conf is newer than the .config file. > > It causes build error if both files have the same time-stamps. > It is actually possible because EXT* file systems have a 1s time-stamp > resolution. > > The config.mk should be included when include/config/auto.conf is > *not older* than the .config file. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Reported-by: Tom Rini <trini@konsulko.com> > Reported-by: York Sun <yorksun@freescale.com> > Reported-by: Stephen Warren <swarren@nvidia.com> > Reported-by: Matthew Gerlach <mgerlach@opensource.altera.com> > Tested-by: Stephen Warren <swarren@nvidia.com> Great job finally root causing this Stephen and then fixing it Masahiro! Applied to u-boot/master, thanks!
diff --git a/Makefile b/Makefile index f1bce44..53ad450 100644 --- a/Makefile +++ b/Makefile @@ -513,12 +513,16 @@ include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd # is up-to-date. When we switch to a different board configuration, old CONFIG # macros are still remaining in include/config/auto.conf. Without the following # gimmick, wrong config.mk would be included leading nasty warnings/errors. -autoconf_is_current := $(if $(wildcard $(KCONFIG_CONFIG)),$(shell find . \ - -path ./include/config/auto.conf -newer $(KCONFIG_CONFIG))) -ifneq ($(autoconf_is_current),) +ifneq ($(wildcard $(KCONFIG_CONFIG)),) +ifneq ($(wildcard include/config/auto.conf),) +autoconf_is_old := $(shell find . -path ./$(KCONFIG_CONFIG) -newer \ + include/config/auto.conf) +ifeq ($(autoconf_is_old),) include $(srctree)/config.mk include $(srctree)/arch/$(ARCH)/Makefile endif +endif +endif # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use # that (or fail if absent). Otherwise, search for a linker script in a
Since the Kconfig conversion, config.mk has been included only when include/config/auto.conf is newer than the .config file. It causes build error if both files have the same time-stamps. It is actually possible because EXT* file systems have a 1s time-stamp resolution. The config.mk should be included when include/config/auto.conf is *not older* than the .config file. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reported-by: Tom Rini <trini@konsulko.com> Reported-by: York Sun <yorksun@freescale.com> Reported-by: Stephen Warren <swarren@nvidia.com> Reported-by: Matthew Gerlach <mgerlach@opensource.altera.com> --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)