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

Use the new executable for mkuserimg_mke2fs

Browse Source 
This is in line with the change of mkuserimg_mke2fs.sh to python binary.

Bug: 112555072
Bug: 63866463
Test: unittests pass
Change-Id: I82c0be1e5bbc685edc15120da73aa43fdc9f2f05
This commit is contained in:
Tianjie Xu
2018-08-15 16:16:21 -07:00
parent 48a575c029
commit 573322279a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -2960,7 +2960,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \ $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \
$(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar \ $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar \
$(HOST_OUT_EXECUTABLES)/mke2fs \ $(HOST_OUT_EXECUTABLES)/mke2fs \
$(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh \ $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs \
$(HOST_OUT_EXECUTABLES)/e2fsdroid \ $(HOST_OUT_EXECUTABLES)/e2fsdroid \
$(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \ $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \
$(HOST_OUT_EXECUTABLES)/mksquashfs \ $(HOST_OUT_EXECUTABLES)/mksquashfs \

2
core/config.mk
View File

@@ -674,7 +674,7 @@ endif
APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX) APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)
FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX) FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)
MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX) MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX)
MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs
MKE2FS_CONF := system/extras/ext4_utils/mke2fs.conf MKE2FS_CONF := system/extras/ext4_utils/mke2fs.conf
BLK_ALLOC_TO_BASE_FS := $(HOST_OUT_EXECUTABLES)/blk_alloc_to_base_fs$(HOST_EXECUTABLE_SUFFIX) BLK_ALLOC_TO_BASE_FS := $(HOST_OUT_EXECUTABLES)/blk_alloc_to_base_fs$(HOST_EXECUTABLE_SUFFIX)
MAKE_SQUASHFS := $(HOST_OUT_EXECUTABLES)/mksquashfs$(HOST_EXECUTABLE_SUFFIX) MAKE_SQUASHFS := $(HOST_OUT_EXECUTABLES)/mksquashfs$(HOST_EXECUTABLE_SUFFIX)

2
tools/releasetools/build_image.py
View File

@@ -625,7 +625,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
if "flash_logical_block_size" in prop_dict: if "flash_logical_block_size" in prop_dict:
build_command.extend(["-o", prop_dict["flash_logical_block_size"]]) build_command.extend(["-o", prop_dict["flash_logical_block_size"]])
# Specify UUID and hash_seed if using mke2fs. # Specify UUID and hash_seed if using mke2fs.
if prop_dict["ext_mkuserimg"] == "mkuserimg_mke2fs.sh": if prop_dict["ext_mkuserimg"] == "mkuserimg_mke2fs":
if "uuid" in prop_dict: if "uuid" in prop_dict:
build_command.extend(["-U", prop_dict["uuid"]]) build_command.extend(["-U", prop_dict["uuid"]])
if "hash_seed" in prop_dict: if "hash_seed" in prop_dict:

2
tools/releasetools/test_build_image.py
View File

@@ -77,7 +77,7 @@ class BuildImageTest(unittest.TestCase):
"""Tests the result parsing from actual call to mke2fs.""" """Tests the result parsing from actual call to mke2fs."""
input_dir = common.MakeTempDir() input_dir = common.MakeTempDir()
output_image = common.MakeTempFile(suffix='.img') output_image = common.MakeTempFile(suffix='.img')
command = ['mkuserimg_mke2fs.sh', input_dir, output_image, 'ext4', command = ['mkuserimg_mke2fs', input_dir, output_image, 'ext4',
'/system', '409600', '-j', '0'] '/system', '409600', '-j', '0']
ext4fs_output, exit_code = RunCommand(command) ext4fs_output, exit_code = RunCommand(command)
self.assertEqual(0, exit_code) self.assertEqual(0, exit_code)

4
tools/releasetools/test_validate_target_files.py
View File

@@ -121,13 +121,13 @@ class ValidateTargetFilesTest(unittest.TestCase):
# Use an empty root directory. # Use an empty root directory.
system_root = common.MakeTempDir() system_root = common.MakeTempDir()
cmd = ['mkuserimg_mke2fs.sh', '-s', system_root, output_file, 'ext4', cmd = ['mkuserimg_mke2fs', '-s', system_root, output_file, 'ext4',
'/system', str(adjusted_size), '-j', '0'] '/system', str(adjusted_size), '-j', '0']
proc = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) proc = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdoutdata, _ = proc.communicate() stdoutdata, _ = proc.communicate()
self.assertEqual( self.assertEqual(
0, proc.returncode, 0, proc.returncode,
"Failed to create system image with mkuserimg_mke2fs.sh: {}".format( "Failed to create system image with mkuserimg_mke2fs: {}".format(
stdoutdata)) stdoutdata))
# Append the verity metadata. # Append the verity metadata.