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:49:20 +0100
commitf9ac0cb9b6abfbde8cecef380d1150add4718cf0 (patch)
treea948b15eb7976ac59cc041dae2f33f151eb2e5c0
parenta681520d048fa84e4f32a7b20d6332baddf57f10 (diff)
downloadpoky-f9ac0cb9b6abfbde8cecef380d1150add4718cf0.tar.gz
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] (From OE-Core rev: f8125a1e9b6893a12355d55d4df584a8d97f0bff) 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 () {
93 echo vol_type=dynamic >> ubinize.cfg 93 echo vol_type=dynamic >> ubinize.cfg
94 echo vol_name=${UBI_VOLNAME} >> ubinize.cfg 94 echo vol_name=${UBI_VOLNAME} >> ubinize.cfg
95 echo vol_flags=autoresize >> ubinize.cfg 95 echo vol_flags=autoresize >> ubinize.cfg
96 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 96 mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}
97 ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg
97} 98}
98IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}" 99IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"
99 100