From 568303aa6778dc3e665067b465b05822013ef558 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 9 Aug 2020 20:58:52 +0200 Subject: [PATCH 28/40] scripts/ubinize-image.sh: allow setting the rootfs name This patch allows us to use a different rootfs name. Some QCA boards will require the in ubi rfs to be called ubi_rootfs. Signed-off-by: John Crispin --- include/image-commands.mk | 1 + scripts/ubinize-image.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 182f5f831d..97eea90ab1 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -214,6 +214,7 @@ define Build/append-ubi sh $(TOPDIR)/scripts/ubinize-image.sh \ $(if $(UBOOTENV_IN_UBI),--uboot-env) \ $(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \ + $(if $(ROOTFSNAME_IN_UBI),--rootfs_name $(ROOTFSNAME_IN_UBI)) \ $(foreach part,$(UBINIZE_PARTS),--part $(part)) \ $(IMAGE_ROOTFS) \ $@.tmp \ diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh index a18d6dc428..c707a67fc4 100755 --- a/scripts/ubinize-image.sh +++ b/scripts/ubinize-image.sh @@ -5,6 +5,7 @@ ubootenv="" ubinize_param="" kernel="" rootfs="" +rootfs_name="rootfs" outfile="" err="" @@ -69,7 +70,7 @@ ubilayout() { ubivol $vol_id kernel "$3" vol_id=$(( $vol_id + 1 )) fi - ubivol $vol_id rootfs "$2" $root_is_ubifs + ubivol $vol_id $rootfs_name "$2" $root_is_ubifs vol_id=$(( $vol_id + 1 )) [ "$root_is_ubifs" ] || ubivol $vol_id rootfs_data "" 1 } @@ -87,6 +88,12 @@ while [ "$1" ]; do shift continue ;; + "--rootfs_name") + rootfs_name="$2" + shift + shift + continue + ;; "--part") parts="$parts $2" shift -- 2.25.1