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

Commit 16a07e18 authored by Yifan Hong's avatar Yifan Hong
Browse files

Add _a and _b to group names to super. 

For A/B devices, append slot suffix to dynamic
partition group names. This ensures that during an
update, partitions from target slot doesn't take
more than half of the super partition.

Test: flash and lpdump
Bug: 111610495
Change-Id: I07a082b67d0f9faada150c7ac3527eb737a81655
parent aefeae36

core/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -2941,11 +2941,12 @@ define build-superimage-target-args 
  --metadata-slots $(if $(1),2,1) \

  --device-size $(BOARD_SUPER_PARTITION_SIZE) \

  $(foreach group,$(BOARD_SUPER_PARTITION_GROUPS), \

    --group $(group):$(BOARD_$(call to-upper,$(group))_SIZE) \

    --group $(group)$(1):$(BOARD_$(call to-upper,$(group))_SIZE) \

    $(if $(1), --group $(group)_b:$(BOARD_$(call to-upper,$(group))_SIZE)) \

    $(foreach name,$(BOARD_$(call to-upper,$(group))_PARTITION_LIST), \

      --partition $(name)$(1):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0):$(group) \

      --partition $(name)$(1):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0):$(group)$(1) \

      $(if $(2), --image $(name)$(1)=$(call images-for-partitions,$(name))) \

      $(if $(1), --partition $(name)_b:readonly:0:$(group)) \

      $(if $(1), --partition $(name)_b:readonly:0:$(group)_b) \

  ))

endef