Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79804fea authored by JP Abgrall's avatar JP Abgrall Committed by Android Git Automerger
Browse files

am 4f072e14: am 7bd80ca6: Merge "core: Let the build specify mount options for... 

am 4f072e14: am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev

* commit '4f072e14':
  core: Let the build specify mount options for recovery
parents 1df38238 4f072e14

core/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -674,6 +674,12 @@ endif 
endif

endif



# These options tell the recovery updater/installer how to mount the partitions writebale.

# <fstype>=<fstype_opts>[|<fstype_opts>]...

# fstype_opts := <opt>[,<opt>]...

#         opt := <name>[=<value>]

DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc



ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s

endif
@@ -1395,6 +1401,12 @@ ifdef BOARD_BOOTIMAGE_PARTITION_SIZE 
endif

ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE

	$(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt

endif

ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS

	@# TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS can be empty to indicate that nothing but defaults should be used.

	$(hide) echo "recovery_mount_options=$(TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt

else

	$(hide) echo "recovery_mount_options=$(DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt

endif

	$(hide) echo "tool_extensions=$(tool_extensions)" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $(zip_root)/META/misc_info.txt