diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-20 18:04:41 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2010-09-21 09:55:29 -0700 |
| commit | 258bf46ea6bb4f25d01fab1b783238589e5bbec4 (patch) | |
| tree | 62bff5a39c435132ba74e5830ac98716735fc386 /core/Makefile | |
| parent | 1020d271c67b062e95b61c4eb9f1f5168e2b6197 (diff) | |
| download | build-258bf46ea6bb4f25d01fab1b783238589e5bbec4.zip build-258bf46ea6bb4f25d01fab1b783238589e5bbec4.tar.gz build-258bf46ea6bb4f25d01fab1b783238589e5bbec4.tar.bz2 | |
support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/Makefile b/core/Makefile index a97d8bf..df7566b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -601,11 +601,16 @@ recovery_resources_common := $(call include-path-for, recovery)/res recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res)) recovery_resource_deps := $(shell find $(recovery_resources_common) \ $(recovery_resources_private) -type f) +recovery_fstab := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.fstab)) ifeq ($(recovery_resources_private),) $(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE)) endif +ifeq ($(recovery_fstab),) + $(info No recovery.fstab for TARGET_DEVICE $(TARGET_DEVICE)) +endif + INTERNAL_RECOVERYIMAGE_ARGS := \ $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \ --kernel $(recovery_kernel) \ @@ -663,6 +668,8 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/ $(foreach item,$(recovery_resources_private), \ cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/) + $(foreach item,$(recovery_fstab), \ + cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop @@ -1011,15 +1018,6 @@ endif ifdef BOARD_USERDATAIMAGE_PARTITION_SIZE $(hide) echo "userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt endif -ifneq (,$(INTERNAL_USERIMAGES_EXT_VARIANT)) - $(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(zip_root)/META/misc_info.txt - $(hide) echo "partition_type=EMMC" >> $(zip_root)/META/misc_info.txt - @# TODO: where is the right place to get this path from? BoardConfig.mk? - $(hide) echo "partition_path=/dev/block/platform/sdhci-tegra.3/by-name/" >> $(zip_root)/META/misc_info.txt -else - $(hide) echo "fs_type=yaffs2" >> $(zip_root)/META/misc_info.txt - $(hide) echo "partition_type=MTD" >> $(zip_root)/META/misc_info.txt -endif $(hide) echo "tool_extensions=$(tool_extensions)" >> $(zip_root)/META/misc_info.txt ifdef mkyaffs2_extra_flags $(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(zip_root)/META/misc_info.txt |