diff options
Diffstat (limited to 'meta')
-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 0a69542fcc..c7d9b8d96d 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -171,7 +171,9 @@ multiubi_mkfs() { | |||
171 | echo vol_type=dynamic >> ubinize${vname}-${IMAGE_NAME}.cfg | 171 | echo vol_type=dynamic >> ubinize${vname}-${IMAGE_NAME}.cfg |
172 | echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg | 172 | echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg |
173 | echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg | 173 | echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg |
174 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} | 174 | if [ -n "$vname" ]; then |
175 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} | ||
176 | fi | ||
175 | ubinize -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubi ${ubinize_args} ubinize${vname}-${IMAGE_NAME}.cfg | 177 | ubinize -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubi ${ubinize_args} ubinize${vname}-${IMAGE_NAME}.cfg |
176 | 178 | ||
177 | # Cleanup cfg file | 179 | # Cleanup cfg file |
@@ -205,6 +207,7 @@ IMAGE_CMD_multiubi () { | |||
205 | IMAGE_CMD_ubi () { | 207 | IMAGE_CMD_ubi () { |
206 | multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" | 208 | multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" |
207 | } | 209 | } |
210 | IMAGE_TYPEDEP_ubi = "ubifs" | ||
208 | 211 | ||
209 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" | 212 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" |
210 | 213 | ||