[oe-commits] Richard Purdie : image_types: Fix ubi filesystem return codes
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 3 15:54:48 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: f8125a1e9b6893a12355d55d4df584a8d97f0bff
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f8125a1e9b6893a12355d55d4df584a8d97f0bff
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Jun 3 12:51:24 2014 +0000
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 at linuxfoundation.org>
---
meta/classes/image_types.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index f38e3b6..99a07da 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}"
More information about the Openembedded-commits
mailing list