Snap for 7339742 from 21e91e2a7a27892f7236d382218fa2a77482f8a8 to sc-release
Change-Id: I0328e3d455fd5def66c1cc17dec4aa7d88b3cd6f
diff --git a/repack_bootimg.py b/repack_bootimg.py
index cad6058..c320018 100755
--- a/repack_bootimg.py
+++ b/repack_bootimg.py
@@ -21,7 +21,9 @@
"""
import argparse
+import datetime
import enum
+import glob
import os
import shlex
import shutil
@@ -75,22 +77,28 @@
"""Enum class for different boot image types."""
BOOT_IMAGE = 1
VENDOR_BOOT_IMAGE = 2
+ SINGLE_RAMDISK_FRAGMENT = 3
+ MULTIPLE_RAMDISK_FRAGMENTS = 4
class RamdiskImage:
"""A class that supports packing/unpacking a ramdisk."""
- def __init__(self, ramdisk_img):
+ def __init__(self, ramdisk_img, unpack=True):
self._ramdisk_img = ramdisk_img
self._ramdisk_format = None
self._ramdisk_dir = None
self._temp_file_manager = TempFileManager()
- self._unpack_ramdisk()
+ if unpack:
+ self._unpack_ramdisk()
+ else:
+ self._ramdisk_dir = self._temp_file_manager.make_temp_dir(
+ suffix='_new_ramdisk')
def _unpack_ramdisk(self):
"""Unpacks the ramdisk."""
self._ramdisk_dir = self._temp_file_manager.make_temp_dir(
- suffix=os.path.basename(self._ramdisk_img))
+ suffix='_' + os.path.basename(self._ramdisk_img))
# The compression format might be in 'lz4' or 'gzip' format,
# trying lz4 first.
@@ -165,10 +173,15 @@
self._unpack_bootimg()
+ def _get_vendor_ramdisks(self):
+ """Returns a list of vendor ramdisks after unpack."""
+ return sorted(glob.glob(
+ os.path.join(self._bootimg_dir, 'vendor_ramdisk*')))
+
def _unpack_bootimg(self):
"""Unpacks the boot.img and the ramdisk inside."""
self._bootimg_dir = self._temp_file_manager.make_temp_dir(
- suffix=os.path.basename(self._bootimg))
+ suffix='_' + os.path.basename(self._bootimg))
# Unpacks the boot.img first.
unpack_bootimg_cmds = [
@@ -179,28 +192,28 @@
]
result = subprocess.run(unpack_bootimg_cmds, check=True,
capture_output=True, encoding='utf-8')
- ignore_next = False
- for arg in shlex.split(result.stdout):
- if ignore_next:
- ignore_next = False
- continue
- # Skips the original ramdisk since we'll pack a new ramdisk.
- if arg in {'--ramdisk', '--vendor_ramdisk'}:
- ignore_next = True
- continue
- self._previous_mkbootimg_args.append(arg)
-
+ self._previous_mkbootimg_args = shlex.split(result.stdout)
print("=== Unpacked boot image: '{}' ===".format(self._bootimg))
# From the output dir, checks there is 'ramdisk' or 'vendor_ramdisk'.
ramdisk = os.path.join(self._bootimg_dir, 'ramdisk')
vendor_ramdisk = os.path.join(self._bootimg_dir, 'vendor_ramdisk')
+ vendor_ramdisks = self._get_vendor_ramdisks()
if os.path.exists(ramdisk):
self._ramdisk = RamdiskImage(ramdisk)
self._bootimg_type = BootImageType.BOOT_IMAGE
elif os.path.exists(vendor_ramdisk):
self._ramdisk = RamdiskImage(vendor_ramdisk)
self._bootimg_type = BootImageType.VENDOR_BOOT_IMAGE
+ elif len(vendor_ramdisks) == 1:
+ self._ramdisk = RamdiskImage(vendor_ramdisks[0])
+ self._bootimg_type = BootImageType.SINGLE_RAMDISK_FRAGMENT
+ elif len(vendor_ramdisks) > 1:
+ # Creates an empty RamdiskImage() below, without unpack.
+ # We'll then add files into this newly created ramdisk, then pack
+ # it with other vendor ramdisks together.
+ self._ramdisk = RamdiskImage(ramdisk_img=None, unpack=False)
+ self._bootimg_type = BootImageType.MULTIPLE_RAMDISK_FRAGMENTS
else:
raise RuntimeError('Both ramdisk and vendor_ramdisk do not exist.')
@@ -216,13 +229,32 @@
# Uses previous mkbootimg args, e.g., --vendor_cmdline, --dtb_offset.
mkbootimg_cmd.extend(self._previous_mkbootimg_args)
- if self._bootimg_type == BootImageType.VENDOR_BOOT_IMAGE:
- mkbootimg_cmd.extend(['--vendor_ramdisk', new_ramdisk])
- mkbootimg_cmd.extend(['--vendor_boot', self._bootimg])
- # TODO(bowgotsai): add support for multiple vendor ramdisk.
- else:
- mkbootimg_cmd.extend(['--ramdisk', new_ramdisk])
+ ramdisk_option = ''
+ if self._bootimg_type == BootImageType.BOOT_IMAGE:
+ ramdisk_option = '--ramdisk'
mkbootimg_cmd.extend(['--output', self._bootimg])
+ elif self._bootimg_type == BootImageType.VENDOR_BOOT_IMAGE:
+ ramdisk_option = '--vendor_ramdisk'
+ mkbootimg_cmd.extend(['--vendor_boot', self._bootimg])
+ elif self._bootimg_type == BootImageType.SINGLE_RAMDISK_FRAGMENT:
+ ramdisk_option = '--vendor_ramdisk_fragment'
+ mkbootimg_cmd.extend(['--vendor_boot', self._bootimg])
+ elif self._bootimg_type == BootImageType.MULTIPLE_RAMDISK_FRAGMENTS:
+ mkbootimg_cmd.extend(['--ramdisk_type', 'PLATFORM'])
+ ramdisk_name = (
+ 'RAMDISK_' +
+ datetime.datetime.now().strftime('%Y-%m-%d_%H:%M:%S'))
+ mkbootimg_cmd.extend(['--ramdisk_name', ramdisk_name])
+ mkbootimg_cmd.extend(['--vendor_ramdisk_fragment', new_ramdisk])
+ mkbootimg_cmd.extend(['--vendor_boot', self._bootimg])
+
+ if ramdisk_option and ramdisk_option not in mkbootimg_cmd:
+ raise RuntimeError("Failed to find '{}' from:\n {}".format(
+ ramdisk_option, shlex.join(mkbootimg_cmd)))
+ # Replaces the original ramdisk with the newly packed ramdisk.
+ if ramdisk_option:
+ ramdisk_index = mkbootimg_cmd.index(ramdisk_option) + 1
+ mkbootimg_cmd[ramdisk_index] = new_ramdisk
subprocess.check_call(mkbootimg_cmd)
print("=== Repacked boot image: '{}' ===".format(self._bootimg))
