diff options
-rw-r--r-- | meta/classes/image_types.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index f363c42ee5..95aa1674cf 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -170,7 +170,9 @@ multiubi_mkfs() { | |||
170 | echo vol_type=dynamic >> ubinize${vname}-${IMAGE_NAME}.cfg | 170 | echo vol_type=dynamic >> ubinize${vname}-${IMAGE_NAME}.cfg |
171 | echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg | 171 | echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg |
172 | echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg | 172 | echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg |
173 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} | 173 | if [ -n "$vname" ]; then |
174 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} | ||
175 | fi | ||
174 | ubinize -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubi ${ubinize_args} ubinize${vname}-${IMAGE_NAME}.cfg | 176 | ubinize -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubi ${ubinize_args} ubinize${vname}-${IMAGE_NAME}.cfg |
175 | 177 | ||
176 | # Cleanup cfg file | 178 | # Cleanup cfg file |
@@ -204,6 +206,7 @@ IMAGE_CMD_multiubi () { | |||
204 | IMAGE_CMD_ubi () { | 206 | IMAGE_CMD_ubi () { |
205 | multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" | 207 | multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" |
206 | } | 208 | } |
209 | IMAGE_TYPEDEP_ubi = "ubifs" | ||
207 | 210 | ||
208 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" | 211 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" |
209 | 212 | ||