From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 3 Nov 2017 09:46:24 +0000 (+0100)
Subject: build: fix regression in append-dtb fix
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=fae5f02912cf358eee9e99e4f54f047f1788ca16;p=openwrt%2Fstaging%2Fjow.git

build: fix regression in append-dtb fix

Strip whitespace from DTS directory
Put the dependency earlier in the chain to avoid make errors

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/include/image.mk b/include/image.mk
index 9ab139cba6..2d7b1ef998 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -438,17 +438,16 @@ endef
 ifndef IB
 define Device/Build/dtb
   $(KDIR)/image-$(1).dtb: FORCE
-	$(call Image/BuildDTB,$(2)/$(1).dts,$$@)
+	$(call Image/BuildDTB,$(strip $(2))/$(1).dts,$$@)
 
-  $(3): $(KDIR)/image-$(1).dtb
+  image_prepare: $(KDIR)/image-$(1).dtb
 endef
 endif
 
 define Device/Build/kernel
   $$(eval $$(foreach dts,$$(DEVICE_DTS), \
 	$$(call Device/Build/dtb,$$(dts), \
-		$$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)),\
-		$$(KDIR_KERNEL_IMAGE) $(KDIR)/$$(KERNEL_INITRAMFS_NAME) \
+		$$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)) \
 	) \
   ))