diff options
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} |