diff options
-rw-r--r-- | meta/classes/image_types.bbclass | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 89a9c92db7..0ffea91195 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -142,6 +142,24 @@ UBI_VOLNAME ?= "${MACHINE}-rootfs" | |||
142 | UBI_VOLTYPE ?= "dynamic" | 142 | UBI_VOLTYPE ?= "dynamic" |
143 | UBI_IMGTYPE ?= "ubifs" | 143 | UBI_IMGTYPE ?= "ubifs" |
144 | 144 | ||
145 | write_ubi_config() { | ||
146 | if [ -z "$1" ]; then | ||
147 | local vname="" | ||
148 | else | ||
149 | local vname="_$1" | ||
150 | fi | ||
151 | |||
152 | cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg | ||
153 | [ubifs] | ||
154 | mode=ubi | ||
155 | image=${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.${UBI_IMGTYPE} | ||
156 | vol_id=0 | ||
157 | vol_type=${UBI_VOLTYPE} | ||
158 | vol_name=${UBI_VOLNAME} | ||
159 | vol_flags=autoresize | ||
160 | EOF | ||
161 | } | ||
162 | |||
145 | multiubi_mkfs() { | 163 | multiubi_mkfs() { |
146 | local mkubifs_args="$1" | 164 | local mkubifs_args="$1" |
147 | local ubinize_args="$2" | 165 | local ubinize_args="$2" |
@@ -151,19 +169,8 @@ multiubi_mkfs() { | |||
151 | bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" | 169 | bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" |
152 | fi | 170 | fi |
153 | 171 | ||
154 | if [ -z "$3" ]; then | 172 | write_ubi_config "$3" |
155 | local vname="" | ||
156 | else | ||
157 | local vname="_$3" | ||
158 | fi | ||
159 | 173 | ||
160 | echo \[ubifs\] > ubinize${vname}-${IMAGE_NAME}.cfg | ||
161 | echo mode=ubi >> ubinize${vname}-${IMAGE_NAME}.cfg | ||
162 | echo image=${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.${UBI_IMGTYPE} >> ubinize${vname}-${IMAGE_NAME}.cfg | ||
163 | echo vol_id=0 >> ubinize${vname}-${IMAGE_NAME}.cfg | ||
164 | echo vol_type=${UBI_VOLTYPE} >> ubinize${vname}-${IMAGE_NAME}.cfg | ||
165 | echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg | ||
166 | echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg | ||
167 | if [ -n "$vname" ]; then | 174 | if [ -n "$vname" ]; then |
168 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} | 175 | mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} |
169 | fi | 176 | fi |