Merge lp:~oem-solutions-releng/live-build/lb-sg-2.x-add-ext4-support into lp:~ce-infrastructure/live-build/lb-sg-2.x

[Timothy R. Chavez]

Gives projects the ability to use ext4 (and implicitly ext3) filesystems via the LB_CHROOT_FILESYSTEM config setting.

[Nicola Heald (notnownikki)]

Looks good to me, generated an ext4 fs when I tried it, so +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-26 17:39:22 +0000
+++ debian/changelog	2013-02-27 06:33:20 +0000
@@ -1,10 +1,17 @@
 live-build (2.0.12-2cesg14) lucid; urgency=low
 
+  [ Mike Heald ]
   * scripts/build/lb_binary_zsync
     - Backported from live-build 3.x and added support for virtual-hdd, net, and tar
     binary images
 
- -- Mike Heald <[e-mail]>  Tue, 26 Feb 2013 16:46:46 -0000
+  [ Timothy Chavez ]
+  * scripts/build/lb_binary_rootfs:
+    - Added ext4 support by backporting it from 3.0.1-1
+  * scripts/build/lb_config:
+    - Added ext4 to --chroot-filesystem options list 
+
+ -- Timothy Chavez <[e-mail]>  Wed, 27 Feb 2013 06:14:30 +0000
 
 live-build (2.0.12-2cesg13) lucid; urgency=low
 

=== modified file 'scripts/build/lb_binary_rootfs'
--- scripts/build/lb_binary_rootfs	2011-05-30 18:27:29 +0000
+++ scripts/build/lb_binary_rootfs	2013-02-27 06:33:20 +0000
@@ -79,9 +79,9 @@
 done
 
 case "${LB_CHROOT_FILESYSTEM}" in
-	ext2|ext3)
+	ext2|ext3|ext4)
 		# Checking depends
-		Check_package chroot/usr/bin/genext2fs genext2fs
+		Check_package chroot/sbin/mkfs.${LB_CHROOT_FILESYSTEM} e2fsprogs
 
 		# Restoring cache
 		Restore_cache cache/packages_binary
@@ -95,14 +95,46 @@
 			rm -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
 		fi
 
-		DU_DIM="$(du -ks chroot/chroot | cut -f1)"
+		case "${LB_BUILD_WITH_CHROOT}" in
+			true)
+				DU_DIM="$(du -ms chroot/chroot | cut -f1)"
+				INODES="$(find chroot/chroot | wc -l)"
+				;;
+
+			false)
+				DU_DIM="$(du -ms chroot | cut -f1)"
+				INODES="$(find chroot | wc -l)"
+				;;
+		esac
+
 		REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_CHROOT_FILESYSTEM})"
+		REAL_INODES="$(Calculate_partition_size ${INODES} ${LB_CHROOT_FILESYSTEM})"
 
 		RESERVED_PERCENTAGE="--reserved-percentage"
 
 		case "${LB_BUILD_WITH_CHROOT}" in
 			true)
-				Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LB_CHROOT_FILESYSTEM}"
+				dd if=/dev/zero of=chroot/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM}
+
+				if ! Chroot chroot "test -s /etc/mtab"
+				then
+					Chroot chroot "ln -s /proc/mounts/mtab /etc/mtab"
+					FAKE_MTAB="true"
+				fi
+
+				Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 filesystem.${LB_CHROOT_FILESYSTEM}"
+
+				mkdir -p filesystem.tmp
+				${LB_ROOT_COMMAND} mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
+				cp -a chroot/chroot/* filesystem.tmp
+
+				if [ "${FAKE_MTAB}" = "true" ]
+				then
+					Chroot chroot "rm -f /etc/mtab"
+				fi
+
+				${LB_ROOT_COMMAND} umount filesystem.tmp
+				rmdir filesystem.tmp
 
 				# Move image
 				mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
@@ -161,7 +193,15 @@
 				;;
 
 			false)
-				genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
+				dd if=/dev/zero of=binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM}
+				mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
+
+				mkdir -p filesystem.tmp
+				${LB_ROOT_COMMAND} mount -o loop binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
+				cp -a chroot/* filesystem.tmp
+
+				${LB_ROOT_COMMAND} umount filesystem.tmp
+				rmdir filesystem.tmp
 				;;
 		esac
 

=== modified file 'scripts/build/lb_config'
--- scripts/build/lb_config	2013-02-22 17:38:29 +0000
+++ scripts/build/lb_config	2013-02-27 06:33:20 +0000
@@ -57,7 +57,7 @@
 \t    [--compression bzip2|gzip|xz|none]\n\
 \t    [--zsync true|false]\n\
 \t    [--build-with-chroot true|false]\n\
-\t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
+\t    [--chroot-filesystem ext2|ext3|ext4|squashfs|plain|jffs2]\n\
 \t    [--clean]\n\
 \t    [-c|--conffile FILE]\n\
 \t    [--debconf-frontend dialog|editor|noninteractive|readline]\n\