genext2fs: Add ext3 and ext4 targets

Change-Id: Id9beb8a809424c4a587f4b513b5322b20a02307f

1 files changed, 10 insertions, 6 deletions

diff --git a/Config.mk b/Config.mk
index be6e9f7..3869ab6 100644
--- a/Config.mk
+++ b/Config.mk
@@ -1,19 +1,23 @@
 # $(1): src directory
 # $(2): output file
 # $(3): label (if any)
-# $(4): if true, add journal
-define build-userimage-ext2-target
+# $(4): ext variant (ext2, ext3, ext4)
+comma := ,
+
+define build-userimage-ext-target
 	@mkdir -p $(dir $(2))
 	$(hide) num_blocks=`du -sk $(1) | tail -n1 | awk '{print $$1;}'`;\
 	if [ $$num_blocks -lt 20480 ]; then extra_blocks=3072; \
 	else extra_blocks=20480; fi ; \
 	num_blocks=`expr $$num_blocks + $$extra_blocks` ; \
 	num_inodes=`find $(1) | wc -l` ; num_inodes=`expr $$num_inodes + 500`; \
-	$(MKEXT2IMG) -a -d $(1) -b $$num_blocks -N $$num_inodes -m 0 $(2)
+	$(hide) $(MKEXT2IMG) -a -d $(1) -b $$num_blocks -N $$num_inodes -m 0 $(2)
 	$(if $(strip $(3)),\
 		$(hide) $(TUNE2FS) -L $(strip $(3)) $(2))
-	$(if $(strip $(4)),\
+	$(if $(filter ext3,$(4)), \
 		$(hide) $(TUNE2FS) -j $(2))
-	$(TUNE2FS) -C 1 $(2)
-	$(E2FSCK) -fy $(2) ; [ $$? -lt 4 ]
+	$(if $(filter ext4,$(4)), \
+		$(hide) $(TUNE2FS) -j -O extents$(comma)uninit_bg$(comma)dir_index $(2))
+	$(hide) $(TUNE2FS) -C 1 $(2)
+	$(hide) $(E2FSCK) -fy $(2) ; [ $$? -lt 4 ]
 endef