p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for system images that contain the root directory 

When the root directory is included in system, the assumption that
system is mounted at /system breaks down. Redirect /system to /
in that case.

Change-Id: I8031b32d7cb9ca699c1cc22939e28afce9d1c847
This commit is contained in:
Daniel Rosenberg 2015-06-05 17:59:27 -07:00 committed by Rom Lemarchand
parent fa7f9f7e0c
commit b3b8ce6241
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@ -182,7 +182,7 @@ def LoadInfoDict(input_file):
makeint("boot_size") makeint("boot_size")
makeint("fstab_version") makeint("fstab_version")
d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"]) d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"], d.get("system_root_image", False))
d["build.prop"] = LoadBuildProp(read_helper) d["build.prop"] = LoadBuildProp(read_helper)
return d return d
@ -205,7 +205,7 @@ def LoadDictionaryFromLines(lines):
d[name] = value d[name] = value
return d return d
def LoadRecoveryFSTab(read_helper, fstab_version): def LoadRecoveryFSTab(read_helper, fstab_version, system_root_image=False):
class Partition(object): class Partition(object):
def __init__(self, mount_point, fs_type, device, length, device2, context): def __init__(self, mount_point, fs_type, device, length, device2, context):
self.mount_point = mount_point self.mount_point = mount_point
@ -297,6 +297,11 @@ def LoadRecoveryFSTab(read_helper, fstab_version):
else: else:
raise ValueError("Unknown fstab_version: \"%d\"" % (fstab_version,)) raise ValueError("Unknown fstab_version: \"%d\"" % (fstab_version,))
# / is used for the system mount point when the root directory is included in
# system. Other areas assume system is always at "/system" so point /system at /
if system_root_image:
assert not d.has_key("/system") and d.has_key("/")
d["/system"] = d["/"]
return d return d