various recipes: fix quoting to work with bitbake master

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

diff --git a/classes/sdcard_image.bbclass b/classes/sdcard_image.bbclass
index 96288ba2cc551b9d42a503bfabfa33ff4075b453..519bd9a3e3047f662fde33024dcc7fdb31a395dd 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"
 
@@ -15,6 +18,9 @@ LOOPDEV_FS ?= "/dev/loop3"
 # Default to 4GiB images
 SDIMG_SIZE ?= "444" 
 
+# FS type for rootfs
+ROOTFSTYPE ?= "ext3"
+
 BOOTPARTNAME_beaglebone = "BEAGLE_BONE"
 BOOTPARTNAME ?= "${MACHINE}"
 
@@ -29,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
 
@@ -68,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
@@ -99,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
@@ -114,27 +121,33 @@ 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
        ${LOSETUP} -d ${LOOPDEV_BOOT} || true
 
-       # Prepare ext3 parition
-       echo "Creating ext3 loopback"
+       # Prepare rootfs parition
+       echo "Creating rootfs loopback"
        ${LOSETUP} ${LOOPDEV_FS} ${SDIMG} -o ${FS_OFFSET}
 
-       # should use fdisk info
-       echo "Creating ext3 image"
-       touch ${WORKDIR}/${IMAGE_NAME}.rootfs.ext3
-       # lots of small files, so use 8k per inode, not 64k
-       genext2fs -i 4096 -b $FS_SIZE_BLOCKS -d ${IMAGE_ROOTFS} ${WORKDIR}/${IMAGE_NAME}.rootfs.ext3
-       tune2fs -L ${IMAGE_NAME} -j ${WORKDIR}/${IMAGE_NAME}.rootfs.ext3
-
-       #ext4 support
-       #cp ${WORKDIR}/${IMAGE_NAME}.rootfs.ext3 ${WORKDIR}/${IMAGE_NAME}.rootfs.ext4 
-       #tune2fs -O extents,uninit_bg,dir_index ${WORKDIR}/${IMAGE_NAME}.rootfs.ext4
-
-       dd if=${WORKDIR}/${IMAGE_NAME}.rootfs.ext3 of=${LOOPDEV_FS}
+       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} ${LOOPDEV_FS}
+                               tune2fs -L ${IMAGE_NAME} -j ${LOOPDEV_FS}
+                               ;;
+               ext4)
+                               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"
+                               exit 1
+                               ;;
+       esac
 
        ${LOSETUP} -d ${LOOPDEV_FS} || true