KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: fix regression in append-dtb fix

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

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2017-11-03 10:46:24 +01:00
parent eb58eba08b
commit fae5f02912
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/image.mk
View file

@ -438,17 +438,16 @@ endef
ifndef IB ifndef IB
define Device/Build/dtb define Device/Build/dtb
$(KDIR)/image-$(1).dtb: FORCE $(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 endef
endif endif
define Device/Build/kernel define Device/Build/kernel
$$(eval $$(foreach dts,$$(DEVICE_DTS), \ $$(eval $$(foreach dts,$$(DEVICE_DTS), \
$$(call Device/Build/dtb,$$(dts), \ $$(call Device/Build/dtb,$$(dts), \
$$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)),\ $$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)) \
$$(KDIR_KERNEL_IMAGE) $(KDIR)/$$(KERNEL_INITRAMFS_NAME) \
) \ ) \
)) ))