summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-03 12:51:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-03 16:45:18 +0100
commitf8125a1e9b6893a12355d55d4df584a8d97f0bff (patch)
treee5ef15deb18c566cbaad76375fed0511d31e7e25
parent1a6ee66aa48e024fc5d112e940488157b74b5fe0 (diff)
downloadopenembedded-core-contrib-f8125a1e9b6893a12355d55d4df584a8d97f0bff.tar.gz
openembedded-core-contrib-f8125a1e9b6893a12355d55d4df584a8d97f0bff.tar.bz2
openembedded-core-contrib-f8125a1e9b6893a12355d55d4df584a8d97f0bff.zip
image_types: Fix ubi filesystem return codes
If the first command returns an error, it will not cause the image generation step to fail. Simply split up the statement into multiple lines to avoid this issue, they no longer need to be one line expressions. [YOCTO #6391] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index f38e3b6a11..99a07da0fc 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -93,7 +93,8 @@ IMAGE_CMD_ubi () {
echo vol_type=dynamic >> ubinize.cfg
echo vol_name=${UBI_VOLNAME} >> ubinize.cfg
echo vol_flags=autoresize >> ubinize.cfg
- mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg
+ mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}
+ ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg
}
IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"