From d51ebcf4b4a368fa7cc9b35518a2480fd60fd448 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 7 Nov 2011 18:07:55 +0100
Subject: [PATCH] sdcard_image bbclass: add proper ext4 support, fix inode
 calculations, etc, etc

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 classes/sdcard_image.bbclass | 39 ++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/classes/sdcard_image.bbclass b/classes/sdcard_image.bbclass
index 96288ba..1737ed9 100644
--- a/classes/sdcard_image.bbclass
+++ b/classes/sdcard_image.bbclass
@@ -15,6 +15,9 @@ LOOPDEV_FS ?= "/dev/loop3"
 # Default to 4GiB images
 SDIMG_SIZE ?= "444" 
 
+# FS type for rootfs
+ROOTFSTYPE ?= "ext3"
+
 BOOTPARTNAME_beaglebone = "BEAGLE_BONE"
 BOOTPARTNAME ?= "${MACHINE}"
 
@@ -119,22 +122,32 @@ IMAGE_CMD_sdimg () {
 	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}
+	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
+				;;
+		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
+				;;
+		*)
+				echo "Please set ROOTFSTYPE to something supported"
+				exit 1
+				;;
+	esac
+
+	dd if=${WORKDIR}/${IMAGE_NAME}.rootfs.img of=${LOOPDEV_FS}
 
 	${LOSETUP} -d ${LOOPDEV_FS} || true
 
-- 
2.39.2