From 7bdc21de7241f779146be2dd7c77bb3a8067a672 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 14 Jul 2016 13:51:49 +0200 Subject: [PATCH] image.mk: fix append-dtb race when multiple devices use the same .dts Call Image/BuildDTB unconditionally to keep things consistent Signed-off-by: Felix Fietkau --- include/image-commands.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 17ab46d859e3..1128aeab6d8b 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -39,8 +39,8 @@ define Build/tplink-safeloader endef define Build/append-dtb - $(if $(DEVICE_DTS_DIR),$(call Image/BuildDTB,$(DEVICE_DTS_DIR)/$(DEVICE_DTS).dts,$(DTS_DIR)/$(DEVICE_DTS).dtb)) - cat $(DTS_DIR)/$(DEVICE_DTS).dtb >> $@ + $(call Image/BuildDTB,$(if $(DEVICE_DTS_DIR),$(DEVICE_DTS_DIR),$(DTS_DIR))/$(DEVICE_DTS).dts,$@.dtb) + cat $@.dtb >> $@ endef define Build/fit -- 2.30.2