3
0
Fork 0

releasetools: fix standalone recovery

Boot and recovery are already regenerated in sign_target_files_apks,
so the scripts galaxys2_img_from_target_files and
galaxys2_ota_from_target_files have no effect.
This fork of sign_target_files_apks makes sure that the standalone
recovery is rebuilt with the new ramdisk and that boot image from $OUT
is used untouched.

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
This commit is contained in:
Wolfgang Wiedmeyer 2017-01-29 20:16:12 +01:00
parent c70556438d
commit ef2a5420a7
No known key found for this signature in database
GPG Key ID: 5816A24C10757FC4
1 changed files with 96 additions and 0 deletions

View File

@ -0,0 +1,96 @@
#!/usr/bin/env python
#
# Copyright (C) 2008 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import os, sys, imp
LOCAL_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
RELEASETOOLS_DIR = os.path.abspath(os.path.join(LOCAL_DIR, '../../../build/tools/releasetools'))
TARGET_DIR = os.getenv('OUT')
# Add releasetools directory to python path
sys.path.append(RELEASETOOLS_DIR)
# Import the existing file so we just have to rewrite the modules we need.
# This is a nasty hack as the filename doesn't end in .py, but it works
filename = os.path.join(RELEASETOOLS_DIR, 'sign_target_files_apks')
f = open(filename, 'rU')
sign_target_files_apks = imp.load_module('sign_target_files_apks', f, filename, ('', 'U', 1))
f.close()
from sign_target_files_apks import *
__doc__ = sign_target_files_apks.__doc__
from common import File
def RebuildRecovery(image_name, unpack_dir, fs_config_file):
"""Takes the modified recovery ramdisk and rebuilds the recovery
image"""
recovery_ramdisk_dir = os.path.join(unpack_dir, "RECOVERY", "RAMDISK")
ramdisk_cpio = os.path.join(TARGET_DIR, "ramdisk-recovery.cpio")
ramdisk_cpio_tmp = os.path.join(TARGET_DIR, "ramdisk-recovery.cpio.orig")
recovery_kernel_dir = os.path.join(TARGET_DIR, "obj", "KERNEL_RECOVERY_OBJ")
recovery_kernel_out = os.path.join(recovery_kernel_dir, "arch", "arm", "boot",
"zImage")
print("Rebuilding the recovery image...")
# temporary move the original ramdisk, move it back later
if os.path.exists(ramdisk_cpio):
os.rename(ramdisk_cpio, ramdisk_cpio_tmp)
else:
print("no ramdisk in $OUT dir")
raise OSError(2, 'No such file or directory', ramdisk_cpio)
ramdisk = open(ramdisk_cpio, "w")
cmd = ["mkbootfs", "-f", fs_config_file, recovery_ramdisk_dir]
p = subprocess.call(cmd, stdout=ramdisk)
if p:
raise ValueError("mkbootfs of %s failed" % recovery_ramdisk_dir)
cross_compile = os.getenv('ARM_EABI_TOOLCHAIN')
subprocess.call(["make", "-C", "kernel/samsung/smdk4412",
"O=" + recovery_kernel_dir, "ARCH=arm",
"CROSS_COMPILE=" + cross_compile, "zImage"])
if p:
raise ValueError("rebuilding recovery failed: " + str(p))
os.rename(ramdisk_cpio_tmp, ramdisk_cpio)
return File.FromLocalFile(image_name, recovery_kernel_out)
def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir,
info_dict=None):
if prebuilt_name == "recovery.img":
fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"
return RebuildRecovery(name, unpack_dir, os.path.join(unpack_dir,
fs_config))
else:
return File.FromLocalFile(name, os.path.join(TARGET_DIR, prebuilt_name))
common.GetBootableImage = GetBootableImage
if __name__ == '__main__':
try:
main(sys.argv[1:])
except common.ExternalError as e:
print()
print(" ERROR: %s" % e)
print()
sys.exit(1)