diff options
| author | Ying Wang <wangying@google.com> | 2010-09-27 17:49:03 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-27 17:49:03 -0700 |
| commit | 026f1451ce0c92c4630ca2d2d95f2fb9d68e9568 (patch) | |
| tree | 4f4b4868f1fa77b132113ecf0bad32d8087f88eb | |
| parent | 1fdbf261a0d550baaed96f5461bb014754364c16 (diff) | |
| download | build-026f1451ce0c92c4630ca2d2d95f2fb9d68e9568.zip build-026f1451ce0c92c4630ca2d2d95f2fb9d68e9568.tar.gz build-026f1451ce0c92c4630ca2d2d95f2fb9d68e9568.tar.bz2 | |
Fix userdata partition's ext4 mount point to data.
Bug: 3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
| -rw-r--r-- | core/Makefile | 4 | ||||
| -rwxr-xr-x | tools/releasetools/img_from_target_files | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 8bd5351..1aabf94 100644 --- a/core/Makefile +++ b/core/Makefile @@ -572,7 +572,7 @@ INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS))) # $(1): src directory # $(2): output file -# $(3): label +# $(3): mount point # $(4): ext variant (ext2, ext3, ext4) # $(5): size of the partition define build-userimage-ext-target @@ -797,7 +797,7 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) define build-userdataimage-target $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)") @mkdir -p $(TARGET_OUT_DATA) - $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),userdata,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_USERDATAIMAGE_PARTITION_SIZE)) + $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),data,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_USERDATAIMAGE_PARTITION_SIZE)) $(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE),yaffs) endef diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index 871e295..f10af49 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -64,7 +64,7 @@ def AddUserdata(output_zip): if OPTIONS.info_dict["fstab"]["/data"].fs_type.startswith("ext"): build_command = ["mkuserimg.sh", user_dir, img.name, - OPTIONS.info_dict["fstab"]["/data"].fs_type, "userdata"] + OPTIONS.info_dict["fstab"]["/data"].fs_type, "data"] if "userdata_size" in OPTIONS.info_dict: build_command.append(str(OPTIONS.info_dict["userdata_size"])) else: |