u-boot-keystone: modify keystone specific version to use new namespace feature

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

diff --git a/classes/sdcard_image.bbclass b/classes/sdcard_image.bbclass
index 1737ed9fb5ab94b16fc602c099885c889337b269..f9b8d467b8edec0b9fc011b138292615b0f505da 100644 (file)
--- a/classes/sdcard_image.bbclass
+++ b/classes/sdcard_image.bbclass
@@ -3,6 +3,9 @@ inherit image
 # Add the fstypes we need
 IMAGE_FSTYPES_append = " tar.bz2 sdimg"
 
+# Ensure required utilities are present
+IMAGE_DEPENDS_sdimg = "genext2fs-native e2fsprogs-native"
+
 # Change this to match your host distro
 LOSETUP ?= "/sbin/losetup"
 
@@ -16,7 +19,7 @@ LOOPDEV_FS ?= "/dev/loop3"
 SDIMG_SIZE ?= "444" 
 
 # FS type for rootfs
-ROOTFSTYPE ?= "ext3"
+ROOTFSTYPE ?= "ext4"
 
 BOOTPARTNAME_beaglebone = "BEAGLE_BONE"
 BOOTPARTNAME ?= "${MACHINE}"
@@ -32,7 +35,7 @@ IMAGE_CMD_sdimg () {
        # sanity check fstab entry for boot partition mounting
        if [ "x$(cat /etc/fstab | grep ${LOOPDEV_BOOT} | grep ${WORKDIR}/tmp-mnt-boot | grep user || true)" = "x" ]; then
                echo "/etc/fstab entries need to be created with the user flag for the loop devices like:"
-               echo "${LOOPDEV_BOOT} ${WORKDIR}/tmp-mnt-boot msdos user 0 0"
+               echo "${LOOPDEV_BOOT} ${WORKDIR}/tmp-mnt-boot vfat user 0 0"
         false
        fi
 
@@ -71,7 +74,7 @@ IMAGE_CMD_sdimg () {
 
        ${LOSETUP} ${LOOPDEV_BOOT} ${SDIMG} -o ${BOOT_OFFSET} 
 
-       /sbin/mkfs.msdos ${LOOPDEV_BOOT} -n ${BOOTPARTNAME} $LOOPDEV_BLOCKS
+       /sbin/mkfs.vfat ${LOOPDEV_BOOT} -n ${BOOTPARTNAME} $LOOPDEV_BLOCKS
 
        # Prepare filesystem partition
        # Copy ubi used by flashing scripts
@@ -102,6 +105,7 @@ IMAGE_CMD_sdimg () {
 
        cp -v ${IMAGE_ROOTFS}/boot/uEnv.txt ${WORKDIR}/tmp-mnt-boot || true
        cp -v ${IMAGE_ROOTFS}/boot/user.txt ${WORKDIR}/tmp-mnt-boot || true
+       cp -v ${IMAGE_ROOTFS}/boot/uImage ${WORKDIR}/tmp-mnt-boot || true
 
        if [ -e ${IMAGE_ROOTFS}/boot/u-boot.$suffix ] ; then
                cp -v ${IMAGE_ROOTFS}/boot/{u-boot.$suffix} ${WORKDIR}/tmp-mnt-boot || true
@@ -117,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
@@ -126,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"
@@ -147,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