diff options
| author | Saul Wold <sgw@linux.intel.com> | 2015-02-10 13:05:53 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 08:40:36 +0000 |
| commit | 14a1c035ba654aff1ec09d884f0b0acf7b83ab79 (patch) | |
| tree | 9e4aaa8247b4f8b65e6c42b48f2407790d8b3352 | |
| parent | 83643dc4edb9c7656726302b92fb22d1c8652dac (diff) | |
| download | openembedded-core-14a1c035ba654aff1ec09d884f0b0acf7b83ab79.tar.gz openembedded-core-14a1c035ba654aff1ec09d884f0b0acf7b83ab79.tar.bz2 openembedded-core-14a1c035ba654aff1ec09d884f0b0acf7b83ab79.zip | |
image_types: Error out if BTRFS image is too small
[YOCTO #6804]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/image_types.bbclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index d6cc87f79d..4983e9834d 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -58,9 +58,14 @@ IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext3 = "oe_mkext234fs ext3 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}" +MIN_BTRFS_SIZE ?= "16777216" IMAGE_CMD_btrfs () { - dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs count=${ROOTFS_SIZE} bs=1024 - mkfs.btrfs ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs + if [ ${ROOTFS_SIZE} -gt ${MIN_BTRFS_SIZE} ]; then + dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs count=${ROOTFS_SIZE} bs=1024 + mkfs.btrfs ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs + else + bbfatal "Rootfs is too small for BTRFS (Rootfs Actual Size: ${ROOTFS_SIZE}, BTRFS Minimum Size: ${MIN_BTRFS_SIZE})" + fi } IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" |