From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 9 Nov 2017 13:26:24 +0000 (+0100)
Subject: build: fix generating dtb with / in DEVICE_DTS
X-Git-Tag: v19.07.0-rc1~5356
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b0e6284879773e9ae407aeb7f37b9ab89e8056ab;p=openwrt%2Fstaging%2Fhauke.git

build: fix generating dtb with / in DEVICE_DTS

Fixes layerscape build error

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

diff --git a/include/image.mk b/include/image.mk
index 96a8892115..f4d0a157cd 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -440,7 +440,7 @@ define Device/Build/dtb
   ifndef BUILD_DTS_$(1)
   BUILD_DTS_$(1) := 1
   $(KDIR)/image-$(1).dtb: FORCE
-	$(call Image/BuildDTB,$(strip $(2))/$(1).dts,$$@)
+	$(call Image/BuildDTB,$(strip $(2))/$(strip $(3)).dts,$$@)
 
   image_prepare: $(KDIR)/image-$(1).dtb
   endif
@@ -450,8 +450,9 @@ endif
 
 define Device/Build/kernel
   $$(eval $$(foreach dts,$$(DEVICE_DTS), \
-	$$(call Device/Build/dtb,$$(dts), \
-		$$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)) \
+	$$(call Device/Build/dtb,$$(notdir $$(dts)), \
+		$$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)), \
+		$$(dts) \
 	) \
   ))