sdcard_image bbclass: make ext4 the default

[glsdk/meta-ti-glsdk.git] / classes / sdcard_image.bbclass

diff --git a/classes/sdcard_image.bbclass b/classes/sdcard_image.bbclass
index 531b419230816c52220f3f94cdd9abd28459d6a0..f9b8d467b8edec0b9fc011b138292615b0f505da 100644 (file)
--- a/classes/sdcard_image.bbclass
+++ b/classes/sdcard_image.bbclass
@@ -19,7 +19,7 @@ LOOPDEV_FS ?= "/dev/loop3"
 SDIMG_SIZE ?= "444" 
 
 # FS type for rootfs
-ROOTFSTYPE ?= "ext3"
+ROOTFSTYPE ?= "ext4"
 
 BOOTPARTNAME_beaglebone = "BEAGLE_BONE"
 BOOTPARTNAME ?= "${MACHINE}"
@@ -121,6 +121,8 @@ IMAGE_CMD_sdimg () {
                done
        fi
 
+       echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${IMAGE_ROOTFS}/etc/image-version-info
+
        # Cleanup VFAT mount
        echo "Cleaning up VFAT mount"
        umount ${WORKDIR}/tmp-mnt-boot
@@ -130,20 +132,16 @@ IMAGE_CMD_sdimg () {
        echo "Creating rootfs loopback"
        ${LOSETUP} ${LOOPDEV_FS} ${SDIMG} -o ${FS_OFFSET}
 
-       # should use fdisk info
-       echo "Creating rootfs image"
-       touch ${WORKDIR}/${IMAGE_NAME}.rootfs.img
-
        FS_NUM_INODES=$(echo $FS_SIZE_BLOCKS / 4 | bc)
 
        case "${ROOTFSTYPE}" in
                ext3)
-                               genext2fs -z -N $FS_NUM_INODES -b $FS_SIZE_BLOCKS -d ${IMAGE_ROOTFS} ${WORKDIR}/${IMAGE_NAME}.rootfs.img
-                               tune2fs -L ${IMAGE_NAME} -j ${WORKDIR}/${IMAGE_NAME}.rootfs.img
+                               genext2fs -z -N $FS_NUM_INODES -b $FS_SIZE_BLOCKS -d ${IMAGE_ROOTFS} ${LOOPDEV_FS}
+                               tune2fs -L ${IMAGE_NAME} -j ${LOOPDEV_FS}
                                ;;
                ext4)
-                               genext2fs -z -N $FS_NUM_INODES -b $FS_SIZE_BLOCKS -d ${IMAGE_ROOTFS} ${WORKDIR}/${IMAGE_NAME}.rootfs.img
-                               tune2fs -L ${IMAGE_NAME} -j -O extents,uninit_bg,dir_index ${WORKDIR}/${IMAGE_NAME}.rootfs.img
+                               genext2fs -z -N $FS_NUM_INODES -b $FS_SIZE_BLOCKS -d ${IMAGE_ROOTFS} ${LOOPDEV_FS}
+                               tune2fs -L ${IMAGE_NAME} -j -O extents,uninit_bg,dir_index ${LOOPDEV_FS}
                                ;;
                *)
                                echo "Please set ROOTFSTYPE to something supported"
@@ -151,8 +149,6 @@ IMAGE_CMD_sdimg () {
                                ;;
        esac
 
-       dd if=${WORKDIR}/${IMAGE_NAME}.rootfs.img of=${LOOPDEV_FS}
-
        ${LOSETUP} -d ${LOOPDEV_FS} || true
 
        gzip -c ${WORKDIR}/sd.img > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-${IMAGEDATESTAMP}.img.gz