diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-11-03 10:46:24 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-11-03 11:00:20 +0100 |
| commit | fae5f02912cf358eee9e99e4f54f047f1788ca16 (patch) | |
| tree | 9b967b7f9ae483b626b489944a75b9cbe61dd0ac | |
| parent | eb58eba08bc093caa65ddef18c550ed251df84c6 (diff) | |
| download | upstream-fae5f02912cf358eee9e99e4f54f047f1788ca16.tar.gz upstream-fae5f02912cf358eee9e99e4f54f047f1788ca16.tar.bz2 upstream-fae5f02912cf358eee9e99e4f54f047f1788ca16.zip | |
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>
| -rw-r--r-- | include/image.mk | 7 |
1 files 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)) \ ) \ )) |