mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

image_types: fix vname var init in multiubi_mkfs() function

Browse Source 
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 <romuald.jeanne@st.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8b5e1cce35e129b21d871ab45b03811fdb6eaf8f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Romuald JEANNE
2023-03-09 08:54:52 +01:00
committed by Richard Purdie
parent 1c6ddbf7b2
commit 02d2cfd198
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes-recipe/image_types.bbclass
+7 -6
View File
@@ -157,11 +157,7 @@ UBI_VOLTYPE ?= "dynamic"
UBI_IMGTYPE ?= "ubifs" UBI_IMGTYPE ?= "ubifs"
write_ubi_config() { write_ubi_config() {
if [ -z "$1" ]; then local vname="$1"
local vname=""
else
local vname="_$1"
fi
cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg
[ubifs] [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" bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details"
fi fi
write_ubi_config "$3" if [ -z "$3" ]; then
local vname=""
else
local vname="_$3"
fi
write_ubi_config "${vname}"
if [ -n "$vname" ]; then if [ -n "$vname" ]; then
mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args}