summaryrefslogtreecommitdiff
path: root/config.mk
diff options
context:
space:
mode:
Diffstat (limited to 'config.mk')
-rw-r--r--config.mk16
1 files changed, 14 insertions, 2 deletions
diff --git a/config.mk b/config.mk
index c01d188..6398b27 100644
--- a/config.mk
+++ b/config.mk
@@ -136,6 +136,7 @@ $(installer_tmp_img): $(MKEXT2IMG) $(internal_installerimage_files)
######################################################################
# Now make a data image that contains all the target image files for the
# installer.
+
bootldr_bin := $(PRODUCT_OUT)/grub/grub.bin
installer_target_data_files := \
$(INSTALLED_BOOTIMAGE_TARGET) \
@@ -143,6 +144,17 @@ installer_target_data_files := \
$(INSTALLED_USERDATAIMAGE_TARGET) \
$(bootldr_bin)
+# $(1): src directory
+# $(2): output file
+# $(3): mount point
+# $(4): ext variant (ext2, ext3, ext4)
+# $(5): size of the partition
+define build-installerimage-ext-target
+ @mkdir -p $(dir $(2))
+ $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$(PATH) \
+ $(MKEXTUSERIMG) $(1) $(2) $(4) $(3) $(5)
+endef
+
installer_data_img := $(TARGET_INSTALLER_OUT)/installer_data.img
$(installer_data_img): $(diskinstaller_root)/config.mk \
$(installer_target_data_files) \
@@ -157,8 +169,8 @@ $(installer_data_img): $(diskinstaller_root)/config.mk \
$(TARGET_INSTALLER_OUT)/data/system.img
cp -f $(INSTALLED_USERDATAIMAGE_TARGET) \
$(TARGET_INSTALLER_OUT)/data/userdata.img
- $(call build-userimage-ext2-target,$(TARGET_INSTALLER_OUT)/data,$@,\
- inst_data,)
+ $(call build-installerimage-ext-target,$(TARGET_INSTALLER_OUT)/data,$@, \
+ inst_data,ext4,$(BOARD_INSTALLERIMAGE_PARTITION_SIZE))
@echo --- Finished installer data image -[ $@ ]-
######################################################################