[openwrt/openwrt] image-commands: fix generating out-of-tree DTO
LEDE Commits
lede-commits at lists.infradead.org
Sat Jul 30 10:09:39 PDT 2022
dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4a28537e4c858888f918c1b6f1210964da2da160
commit 4a28537e4c858888f918c1b6f1210964da2da160
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Thu Jul 14 04:25:36 2022 +0100
image-commands: fix generating out-of-tree DTO
Hack path so DTO generation works also for out-of-tree device tree
sources which currently fail.
Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
include/image-commands.mk | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/image-commands.mk b/include/image-commands.mk
index 402e3d71ed..6fe2890a1a 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -279,9 +279,11 @@ endef
define Build/fit
$(TOPDIR)/scripts/mkits.sh \
-D $(DEVICE_NAME) -o $@.its -k $@ \
- -C $(word 1,$(1)) $(if $(word 2,$(1)),\
- $(if $(DEVICE_DTS_OVERLAY),-d $(KERNEL_BUILD_DIR)/image-$$(basename $(word 2,$(1))),\
- -d $(word 2,$(1)))) \
+ -C $(word 1,$(1)) \
+ $(if $(word 2,$(1)),\
+ $(if $(findstring 11,$(if $(DEVICE_DTS_OVERLAY),1)$(if $(findstring $(KERNEL_BUILD_DIR)/image-,$(word 2,$(1))),,1)), \
+ -d $(KERNEL_BUILD_DIR)/image-$$(basename $(word 2,$(1))), \
+ -d $(word 2,$(1)))) \
$(if $(findstring with-rootfs,$(word 3,$(1))),-r $(IMAGE_ROOTFS)) \
$(if $(findstring with-initrd,$(word 3,$(1))), \
$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \
More information about the lede-commits
mailing list