summaryrefslogtreecommitdiffstats
path: root/meta/classes
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-10 17:12:19 +0100
commit9ee3f77ed9fd722aa15252d1c7d717249cf85acb (patch)
treea87c8ca3267ebc49968067677ee08fe8c5a07a00 /meta/classes
parenta714cf870046d736d45aa1c3f891bdc877a3ca0e (diff)
downloadpoky-9ee3f77ed9fd722aa15252d1c7d717249cf85acb.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) (From OE-Core rev: 414f9b4d2dd39845b537ebdc2a4ecafbd9162343) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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