From 02d2cfd198704a6b5e4536cc799dc97ea5acbf1a Mon Sep 17 00:00:00 2001 From: Romuald JEANNE Date: Thu, 9 Mar 2023 08:54:52 +0100 Subject: [PATCH] image_types: fix vname var init in multiubi_mkfs() function As vname var is needed in multiubi_mkfs() function, we need to keep it defined and use it as parameter to the new write_ubi_config() function. See [YOCTO #15027] (From OE-Core rev: 705b5c51610a1d5a267a3f6559667a5f70fbadf5) Signed-off-by: Romuald JEANNE Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8b5e1cce35e129b21d871ab45b03811fdb6eaf8f) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes-recipe/image_types.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 764e6a5574..c6cb8f5336 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -157,11 +157,7 @@ UBI_VOLTYPE ?= "dynamic" UBI_IMGTYPE ?= "ubifs" write_ubi_config() { - if [ -z "$1" ]; then - local vname="" - else - local vname="_$1" - fi + local vname="$1" cat < ubinize${vname}-${IMAGE_NAME}.cfg [ubifs] @@ -183,7 +179,12 @@ multiubi_mkfs() { bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" fi - write_ubi_config "$3" + if [ -z "$3" ]; then + local vname="" + else + local vname="_$3" + fi + write_ubi_config "${vname}" if [ -n "$vname" ]; then mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args}