summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image_types.bbclass10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index ecb066bf99..306403e310 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -120,7 +120,11 @@ UBI_VOLNAME ?= "${MACHINE}-rootfs"
120multiubi_mkfs() { 120multiubi_mkfs() {
121 local mkubifs_args="$1" 121 local mkubifs_args="$1"
122 local ubinize_args="$2" 122 local ubinize_args="$2"
123 local vname="_$3" 123 if [ -z "$3" ]; then
124 local vname=""
125 else
126 local vname="_$3"
127 fi
124 128
125 echo \[ubifs\] > ubinize${vname}.cfg 129 echo \[ubifs\] > ubinize${vname}.cfg
126 echo mode=ubi >> ubinize${vname}.cfg 130 echo mode=ubi >> ubinize${vname}.cfg
@@ -158,7 +162,9 @@ IMAGE_CMD_multiubi () {
158 done 162 done
159} 163}
160 164
161IMAGE_CMD_ubi = "multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" "${UBI_VOLNAME}"" 165IMAGE_CMD_ubi () {
166 multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}"
167}
162 168
163IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}" 169IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"
164 170