diff options
author | Romuald JEANNE <romuald.jeanne@st.com> | 2023-03-09 08:54:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-14 17:10:00 +0000 |
commit | 3c80abad54582057ee35c65b21e4cef00d169403 (patch) | |
tree | 70ee01f349daca7d345b6fb11394e7d88cef1cbb /meta/classes-recipe/image_types.bbclass | |
parent | cafed9767126bd6899e450c984be794edd9ede61 (diff) | |
download | poky-3c80abad54582057ee35c65b21e4cef00d169403.tar.gz |
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: 8b5e1cce35e129b21d871ab45b03811fdb6eaf8f)
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>
Diffstat (limited to 'meta/classes-recipe/image_types.bbclass')
-rw-r--r-- | meta/classes-recipe/image_types.bbclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index ae00728a74..57f54f0588 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass | |||
@@ -161,11 +161,7 @@ UBI_VOLTYPE ?= "dynamic" | |||
161 | UBI_IMGTYPE ?= "ubifs" | 161 | UBI_IMGTYPE ?= "ubifs" |
162 | 162 | ||
163 | write_ubi_config() { | 163 | write_ubi_config() { |
164 | if [ -z "$1" ]; then | 164 | local vname="$1" |
165 | local vname="" | ||
166 | else | ||
167 | local vname="_$1" | ||
168 | fi | ||
169 | 165 | ||
170 | cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg | 166 | cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg |
171 | [ubifs] | 167 | [ubifs] |
@@ -187,7 +183,12 @@ multiubi_mkfs() { | |||
187 | bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" | 183 | bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" |
188 | fi | 184 | fi |
189 | 185 | ||
190 | write_ubi_config "$3" | 186 | if [ -z "$3" ]; then |
187 | local vname="" | ||
188 | else | ||
189 | local vname="_$3" | ||
190 | fi | ||
191 | write_ubi_config "${vname}" | ||
191 | 192 | ||
192 | if [ -n "$vname" ]; then | 193 | if [ -n "$vname" ]; then |
193 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} | 194 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} |