From fae5f02912cf358eee9e99e4f54f047f1788ca16 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 3 Nov 2017 10:46:24 +0100 Subject: [PATCH 1/1] 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 --- include/image.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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)) \ ) \ )) -- 2.30.2