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

Commit 5ecb42fd authored by Tom Marshall's avatar Tom Marshall Committed by Michael Bestas
Browse files

build: ota: Support for install tools in /tmp/install 

 * Anything in OUT/install gets packaged up into the zip and extracted
   to /tmp/install immediately after FullOTA_InstallBegin.

 * Use /tmp/install in edify scripts and remove code related to using
   and manipulating /system for install tools.

 * Modified to support signing steps being split from build steps.

   Package install files into target-files INSTALL path
   Read from target-files for OTA package creation

   From Change-Id: I64f919c2a757b5474f6cc5f82bd6c33c2a8b558a

 * This also fully reverts commit 6a324ba5 and partially reverts
   commit f388104e as the functions are still needed here.

   From Change-Ids: I4911244ec9945d197d2b56d0d11eab6d2f7b6d3e
                    I4943e2e89ee5c810a63746c570dc5e31e95b8c53

Change-Id: I315a3238e36c8d15e26f935e272f7e27dd59c320
parent 1d691367

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -3788,6 +3788,9 @@ ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_ 
	$(hide) mkdir -p $(zip_root)/$(PRIVATE_RECOVERY_OUT)

	$(hide) $(call package_files-copy-root, \

	    $(TARGET_RECOVERY_ROOT_OUT),$(zip_root)/$(PRIVATE_RECOVERY_OUT)/RAMDISK)

	@# OTA install helpers

	$(hide) $(call package_files-copy-root, \

	    $(PRODUCT_OUT)/install,$(zip_root)/INSTALL)

ifdef INSTALLED_KERNEL_TARGET

	$(hide) cp $(INSTALLED_KERNEL_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/kernel

endif
@@ -3961,6 +3964,7 @@ ifdef PRODUCT_EXTRA_RECOVERY_KEYS 
endif

	$(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $(zip_root)/META/misc_info.txt

	$(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $(zip_root)/META/misc_info.txt

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

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

	$(hide) echo "blockimgdiff_versions=3,4" >> $(zip_root)/META/misc_info.txt

ifneq ($(OEM_THUMBPRINT_PROPERTIES),)

tools/releasetools/edify_generator.py

+24 −0
Original line number Diff line number Diff line
@@ -225,6 +225,11 @@ class EdifyGenerator(object): 
          p.mount_point, mount_flags))

      self.mounts.add(p.mount_point)



  def UnpackPackageDir(self, src, dst):

    """Unpack a given directory from the OTA package into the given

    destination directory."""

    self.script.append('package_extract_dir("%s", "%s");' % (src, dst))



  def Comment(self, comment):

    """Write a comment into the update script."""

    self.script.append("")
@@ -306,6 +311,25 @@ class EdifyGenerator(object): 
            target=target, source=source, patch=patch,

            code=common.ErrorCode.APPLY_PATCH_FAILURE)))



  def SetPermissionsRecursive(self, fn, uid, gid, dmode, fmode, selabel,

                              capabilities):

    """Recursively set path ownership and permissions."""

    if not self.info.get("use_set_metadata", False):

      self.script.append('set_perm_recursive(%d, %d, 0%o, 0%o, "%s");'

                         % (uid, gid, dmode, fmode, fn))

    else:

      if capabilities is None:

        capabilities = "0x0"

      cmd = 'set_metadata_recursive("%s", "uid", %d, "gid", %d, ' \

          '"dmode", 0%o, "fmode", 0%o' \

          % (fn, uid, gid, dmode, fmode)

      if not fn.startswith("/tmp"):

        cmd += ', "capabilities", "%s"' % capabilities

      if selabel is not None:

        cmd += ', "selabel", "%s"' % selabel

      cmd += ');'

      self.script.append(cmd)



  def WriteRawImage(self, mount_point, fn, mapfn=None):

    """Write the given package file into the partition for the given

    mount point."""

tools/releasetools/ota_from_target_files.py

+15 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ METADATA_NAME = 'META-INF/com/android/metadata' 
POSTINSTALL_CONFIG = 'META/postinstall_config.txt'

DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt'

AB_PARTITIONS = 'META/ab_partitions.txt'

UNZIP_PATTERN = ['IMAGES/*', 'META/*', 'RADIO/*']

UNZIP_PATTERN = ['IMAGES/*', 'INSTALL/*', 'META/*', 'RADIO/*']

RETROFIT_DAP_UNZIP_PATTERN = ['OTA/super_*.img', AB_PARTITIONS]



# Images to be excluded from secondary payload. We essentially only keep
@@ -861,6 +861,15 @@ def AddCompatibilityArchiveIfTrebleEnabled(target_zip, output_zip, target_info, 
                          vendor_updated or odm_updated)





def CopyInstallTools(output_zip):

  install_path = os.path.join(OPTIONS.input_tmp, "INSTALL")

  for root, subdirs, files in os.walk(install_path):

     for f in files:

      install_source = os.path.join(root, f)

      install_target = os.path.join("install", os.path.relpath(root, install_path), f)

      output_zip.write(install_source, install_target)





def WriteFullOTAPackage(input_zip, output_file):

  target_info = BuildInfo(OPTIONS.info_dict, OPTIONS.oem_dicts)
@@ -954,6 +963,11 @@ else if get_stage("%(bcb_dev)s") == "3/3" then 
  script.AppendExtra("ifelse(is_mounted(\"/system\"), unmount(\"/system\"));")

  device_specific.FullOTA_InstallBegin()



  CopyInstallTools(output_zip)

  script.UnpackPackageDir("install", "/tmp/install")

  script.SetPermissionsRecursive("/tmp/install", 0, 0, 0755, 0644, None, None)

  script.SetPermissionsRecursive("/tmp/install/bin", 0, 0, 0755, 0755, None, None)



  system_progress = 0.75



  if OPTIONS.wipe_user_data: