sdcard_image-rpi.bbclass: use existing ROOTFS_SIZE variable
PATCH 1/1 sdcard_image-rpi.bbclass: use existing ROOTFS_SIZE variable
The ROOTFS_SIZE variable is already set to the aligned root filesystem size.
Signed-off-by Jonathan Liu <[email protected]>
--- classes/sdcard_image-rpi.bbclass | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
classes/sdcard_image-rpi.bbclass +2 -6
@@ -78,13 +78,9 @@ IMAGE_CMD_rpi-sdimg () { # Align partitions BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - ROOTFS_SIZE=`du -bks ${SDIMG_ROOTFS} | awk '{print $1}'` - # Round up RootFS size to the alignment size as well - ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) - ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} - ${ROOTFS_SIZE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED}) + SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE) - echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS ${ROOTFS_SIZE_ALIGNED} KiB" + echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB" # Check if we are building with device tree support DTS="${@get_dts(d, None)}"
Signature · 1 line
2.5.0
Andrei Gherzan
AppliedHello,
Quoted 6 lines · Jonathan Liu
The
ROOTFS_SIZEvariable is already set to the aligned root filesystem size.Signed-off-by Jonathan Liu <[email protected]>--- classes/sdcard_image-rpi.bbclass | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
Merged to master. Thanks.
--
Andrei Gherzan