From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 14 Jul 2016 11:51:49 +0000 (+0200)
Subject: image.mk: fix append-dtb race when multiple devices use the same .dts
X-Git-Tag: v17.01.0-rc1~2044
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7bdc21de7241f779146be2dd7c77bb3a8067a672;p=openwrt%2Fopenwrt.git

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 <nbd@nbd.name>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 17ab46d859..1128aeab6d 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