From: John Thomson Date: Thu, 16 May 2024 00:16:53 +0000 (+1000) Subject: image: adapt mikrotik yafut to allow switch to bootimage YAFFS path X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=097049552a0eb24592c757af77124cad6befe060;p=openwrt%2Fstaging%2Fnbd.git image: adapt mikrotik yafut to allow switch to bootimage YAFFS path Adjust the YAFFS file path written depending on the sysupgrade filename. Default to kernel (for ELF), switch to bootimage (for NPK) if image name has v7. Signed-off-by: John Thomson --- diff --git a/include/image-commands.mk b/include/image-commands.mk index ad57dfd49b..27a85d770e 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -519,7 +519,7 @@ define Build/yaffs-filesystem filesystem_size="filesystem_blocks * 64 * 1024" \ filesystem_size_with_reserve="(filesystem_blocks + 2) * 64 * 1024"; \ head -c $$filesystem_size_with_reserve /dev/zero | tr "\000" "\377" > $@.img \ - && yafut -d $@.img -w -i $@ -o kernel -C 1040 -B 64k -E -P -S $(1) \ + && yafut -d $@.img -w -i $@ -o $(if $(findstring v7,$@),bootimage,kernel) -C 1040 -B 64k -E -P -S $(1) \ && truncate -s $$filesystem_size $@.img \ && mv $@.img $@ endef