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

Commit 8cf2cce9 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-19.1' into v1-s

parents 4a24981a 722c54d2
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -3505,15 +3505,16 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,

  full_recovery_image = info_dict.get("full_recovery_image") == "true"
  board_uses_vendorimage = info_dict.get("board_uses_vendorimage") == "true"
  board_builds_vendorimage =  info_dict.get("board_builds_vendorimage") == "true"

  if board_uses_vendorimage:
    # In this case, the output sink is rooted at VENDOR
  recovery_img_path = "etc/recovery.img"
  if board_builds_vendorimage:
    recovery_resource_dat_path = "VENDOR/etc/recovery-resource.dat"
  else:
    # In this case the output sink is rooted at SYSTEM
    recovery_img_path = "vendor/etc/recovery.img"
  elif not board_uses_vendorimage:
    recovery_resource_dat_path = "SYSTEM/vendor/etc/recovery-resource.dat"
  else:
    logger.warning('Recovery patch generation is disable when prebuilt vendor image is used.')
    return None

  if full_recovery_image:
    output_sink(recovery_img_path, recovery_img.data)