From c0434ac8b504df8a2f2a2828dc9b3f804c3dda72 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 21 Sep 2010 14:25:51 -0700 Subject: [PATCH] add recovery.fstab as dependency so it triggers rebuild (do not merge) Make recovery image depend on the fstab file so it gets rebuilt when fstab changes. Add support for "emmc" fstab partition type to edify_generator. Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b --- core/Makefile | 1 + tools/releasetools/edify_generator.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index df7566b0b..ad964c12e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -652,6 +652,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ $(recovery_initrc) $(recovery_kernel) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \ $(recovery_build_prop) $(recovery_resource_deps) \ + $(recovery_fstab) \ $(RECOVERY_INSTALL_OTA_KEYS) @echo ----- Making recovery image ------ rm -rf $(TARGET_RECOVERY_OUT) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 012c06a60..c7bca49eb 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -22,7 +22,8 @@ class EdifyGenerator(object): used from donut onwards.""" # map recovery.fstab's fs_types to mount/format "partition types" - PARTITION_TYPES = { "yaffs2": "MTD", "mtd": "MTD", "ext4": "EMMC" } + PARTITION_TYPES = { "yaffs2": "MTD", "mtd": "MTD", + "ext4": "EMMC", "emmc": "EMMC" } def __init__(self, version, info): self.script = []