mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

image.mk: fix append-dtb race when multiple devices use the same .dts

Browse Source 
Call Image/BuildDTB unconditionally to keep things consistent

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-14 13:51:49 +02:00
parent b948c9371b
commit 7bdc21de72
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/image-commands.mk
View File

@ -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