StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support a first stage ramdisk via TARGET_RAMDISK_OUT

Browse Source 
Support a first stage ramdisk which will include the targets placed
into TARGET_RAMDISK_OUT.  This replaces the existing ramdisk on
existing devices.

All system images are now built to be mounted as the root dir.
Devices with a first stage ramdisk will switch root to the system
partition.

BOARD_BUILD_SYSTEM_ROOT_IMAGE remains and is used to specify if the
system partition is going to be directly used as rootfs without the
ramdisk.

Bug: 79173823
Bug: 79758715
Test: hikey boots, sailfish boots
Test: OTA walleye from P to master
Change-Id: Idbb2dccc6340b0235a4bef03e11e420a9ed154b6
This commit is contained in:
Tom Cherry
2018-08-09 14:26:00 -07:00
parent 6601397608
commit d14b895665
7 changed files with 81 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/releasetools/test_build_image.py
View File

@@ -96,16 +96,6 @@ class BuildImageTest(unittest.TestCase):
}
self.assertFalse(CheckHeadroom(ext4fs_output, prop_dict))
def test_SetUpInDirAndFsConfig_SystemRootImageFalse(self):
prop_dict = {
'fs_config': 'fs-config',
'mount_point': 'system',
}
in_dir, fs_config = SetUpInDirAndFsConfig('/path/to/in_dir', prop_dict)
self.assertEqual('/path/to/in_dir', in_dir)
self.assertEqual('fs-config', fs_config)
self.assertEqual('system', prop_dict['mount_point'])
def test_SetUpInDirAndFsConfig_SystemRootImageTrue_NonSystem(self):
prop_dict = {
'fs_config': 'fs-config',
@@ -124,7 +114,7 @@ class BuildImageTest(unittest.TestCase):
fs_config_fp.write('fs-config-{}\n'.format(partition))
return fs_config
def test_SetUpInDirAndFsConfig_SystemRootImageTrue(self):
def test_SetUpInDirAndFsConfig(self):
root_dir = common.MakeTempDir()
with open(os.path.join(root_dir, 'init'), 'w') as init_fp:
init_fp.write('init')
@@ -140,7 +130,6 @@ class BuildImageTest(unittest.TestCase):
'fs_config': fs_config_system,
'mount_point': 'system',
'root_dir': root_dir,
'system_root_image': 'true',
}
in_dir, fs_config = SetUpInDirAndFsConfig(origin_in, prop_dict)
@@ -154,7 +143,7 @@ class BuildImageTest(unittest.TestCase):
self.assertTrue(filecmp.cmp(fs_config_system, fs_config))
self.assertEqual('/', prop_dict['mount_point'])
def test_SetUpInDirAndFsConfig_SystemRootImageTrue_WithRootFsConfig(self):
def test_SetUpInDirAndFsConfig_WithRootFsConfig(self):
root_dir = common.MakeTempDir()
with open(os.path.join(root_dir, 'init'), 'w') as init_fp:
init_fp.write('init')
@@ -172,7 +161,6 @@ class BuildImageTest(unittest.TestCase):
'mount_point': 'system',
'root_dir': root_dir,
'root_fs_config': fs_config_root,
'system_root_image': 'true',
}
in_dir, fs_config = SetUpInDirAndFsConfig(origin_in, prop_dict)