From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 16 Feb 2024 13:55:12 +0000 (+0000)
Subject: images: append to existing image with ubinize-image build cmd
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=132331408793d8fe9a613e825ac8b56878a2d2a8;p=openwrt%2Fstaging%2Fnbd.git

images: append to existing image with ubinize-image build cmd

Let ubinize-image append the ubinized image to the existing image
instead of replacing it.

Fixes: 6c17d71973 ("scripts: ubinize-image.sh: support static volumes, make size optional")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 8caeb1871c..79a64f4bc1 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -157,11 +157,13 @@ define Build/ubinize-image
 		$(if $(UBOOTENV_IN_UBI),--uboot-env) \
 		$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
 		--part $(word 1,$(1))="$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(word 2,$(1))" \
-		$@ \
+		$@.tmp \
 		-p $(BLOCKSIZE:%k=%KiB) -m $(PAGESIZE) \
 		$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
 		$(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
 		$(UBINIZE_OPTS)
+	cat $@.tmp >> $@
+	rm $@.tmp
 endef
 
 define Build/ubinize-kernel