Add hibernation image area

[AGL/meta-agl.git] / meta-agl-bsp / classes / sdcard_image-rpi-gdp.bbclass

diff --git a/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass b/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass
index 2956dd0..725ada8 100644 (file)
--- a/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass
+++ b/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass
@@ -2,12 +2,28 @@ inherit sdcard_image-rpi
 
 IMAGE_CMD_rpi-sdimg () {
 
+       # Get rootfs size
+       if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
+       then
+               ROOTPART_SIZE=`xz -l --robot ${SDIMG_ROOTFS} | grep "^file" | cut -f`
+       else
+               ROOTPART_SIZE=`du -Lb ${SDIMG_ROOTFS} | cut -f1`
+       fi
+
+       ROOTPART_SIZE=$(expr ${ROOTPART_SIZE} / 1024)
+
+       # just in case our file system block size is not a multiple of 1KiB
+       if [ $(expr ${ROOTPART_SIZE} % 1024) != 0 ];
+       then
+               ROOTPART_SIZE=$(expr ${ROOTPART_SIZE} + 1)
+       fi
+
        # 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})
-       SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE)
+       SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTPART_SIZE)
 
-       echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
+       echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTPART_SIZE KiB"
 
        # Check if we are building with device tree support
        DTS="${@get_dts(d, None)}"
@@ -50,9 +66,10 @@ IMAGE_CMD_rpi-sdimg () {
                        # Copy device tree overlays to dedicated folder
                        mmd -i ${WORKDIR}/boot.img overlays
                        for DTB in ${DT_OVERLAYS}; do
-                               DTB_BASE_NAME=`basename ${DTB} .dtb`
+                               DTB_EXT=${DTB##*.}
+                               DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
 
-                               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtbo
+                               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT}
                        done
                fi
                mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}