From: Robert Marko <robimarko@gmail.com>
Date: Mon, 20 Sep 2021 10:16:42 +0000 (+0200)
Subject: build: image: explicitly pass --rootfs to append-ubi
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6db4a0372a726ebc1720adf308d698a5df9f1af1;p=openwrt%2Fstaging%2Fldir.git

build: image: explicitly pass --rootfs to append-ubi

Rootfs is now optional in ubinize-image.sh and
requires --rootfs flag instead of just passing the
rootfs image as the argument before ubinize opts.

So, simply add --rootfs flag before the $(IMAGE_ROOTFS).

Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 23c7bd6133..4b5ff36ebe 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -112,7 +112,7 @@ define Build/append-ubi
 		$(if $(UBOOTENV_IN_UBI),--uboot-env) \
 		$(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \
 		$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
-		$(IMAGE_ROOTFS) \
+		--rootfs $(IMAGE_ROOTFS) \
 		$@.tmp \
 		-p $(BLOCKSIZE:%k=%KiB) -m $(PAGESIZE) \
 		$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \