[openwrt/openwrt] build: image: explicitly pass --rootfs to append-ubi

LEDE Commits lede-commits at lists.infradead.org
Sun Nov 28 09:48:26 PST 2021


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6db4a0372a726ebc1720adf308d698a5df9f1af1

commit 6db4a0372a726ebc1720adf308d698a5df9f1af1
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Mon Sep 20 12:16:42 2021 +0200

    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 at gmail.com>
---
 include/image-commands.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)) \



More information about the lede-commits mailing list