diff --git a/ohos/images/BUILD.gn b/ohos/images/BUILD.gn index 38fdd40ce5a233c2a2be896145ed6b5ec70af09c..f0798c7f71674c780b43bdd6257cc3438fdd5cf0 100644 --- a/ohos/images/BUILD.gn +++ b/ohos/images/BUILD.gn @@ -26,6 +26,8 @@ group("make_images") { ] foreach(_platform, target_platform_list) { deps += [ + ":${_platform}_eng_chipset_image", + ":${_platform}_eng_system_image", ":${_platform}_sys_prod_image", ":${_platform}_system_image", ":${_platform}_updater_ramdisk_image", @@ -42,6 +44,32 @@ group("make_images") { } } +group("eng_system_image") { + deps = [] + if (is_standard_system) { + deps += [ + "//third_party/e2fsprogs:e2fsprogs_host_toolchain", + "//third_party/f2fs-tools:f2fs-tools_host_toolchain", + ] + } + foreach(_platform, target_platform_list) { + deps += [ ":${_platform}_eng_system_image" ] + } +} + +group("eng_chipset_image") { + deps = [] + if (is_standard_system) { + deps += [ + "//third_party/e2fsprogs:e2fsprogs_host_toolchain", + "//third_party/f2fs-tools:f2fs-tools_host_toolchain", + ] + } + foreach(_platform, target_platform_list) { + deps += [ ":${_platform}_eng_chipset_image" ] + } +} + group("chip_prod_image") { deps = [] if (is_standard_system) { @@ -175,6 +203,8 @@ foreach(_platform, target_platform_list) { "sys_prod", "chip_prod", "updater_ramdisk", + "eng_system", + "eng_chipset", ] if (enable_ramdisk) { image_list += [ "ramdisk" ] diff --git a/ohos/images/build_image.py b/ohos/images/build_image.py index d93a4149829c929c834e5e19f3480cdad18f64de..15ecf68bee82142e301b4649335bfabe3a0d8152 100755 --- a/ohos/images/build_image.py +++ b/ohos/images/build_image.py @@ -38,7 +38,7 @@ def _prepare_root(system_path, target_cpu): os.makedirs(root_dir, exist_ok=True) _dir_list = [ 'config', 'dev', 'proc', 'sys', 'updater', 'system', 'vendor', 'data', - 'storage', 'mnt', 'tmp', 'sys_prod', 'chip_prod', 'module_update' + 'storage', 'mnt', 'tmp', 'sys_prod', 'chip_prod', 'module_update', 'eng_system', 'eng_chipset' ] for _dir_name in _dir_list: os.makedirs(os.path.join(root_dir, _dir_name), exist_ok=True) diff --git a/ohos/images/mkimage/dac.txt b/ohos/images/mkimage/dac.txt index 3ddc73db5ffd64ec046e5dc94dc3062b16172159..17020253eb8e76ef91c57a390b188cd9f7f117c9 100644 --- a/ohos/images/mkimage/dac.txt +++ b/ohos/images/mkimage/dac.txt @@ -13,6 +13,8 @@ sbin, 00750, 0, 2000, 0 system/bin, 00751, 0, 2000, 0 vendor/bin, 00751, 0, 2000, 0 vendor, 00755, 0, 2000, 0 +eng_system, 00755, 0, 2000, 0 +eng_chipset, 00755, 0, 2000, 0 sys_prod, 00755, 0, 2000, 0 chip_prod, 00755, 0, 2000, 0 system/etc/init, 00500, 0, 0, 0 diff --git a/ohos/images/mkimage/debug/eng_chipset_image_conf.txt b/ohos/images/mkimage/debug/eng_chipset_image_conf.txt new file mode 100755 index 0000000000000000000000000000000000000000..051d37a240ac9acb3b520ba574a8c1334642ccd4 --- /dev/null +++ b/ohos/images/mkimage/debug/eng_chipset_image_conf.txt @@ -0,0 +1,5 @@ +/eng_chipset +16777216 +--fs_type=ext4 +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux/file_contexts.bin diff --git a/ohos/images/mkimage/debug/eng_system_image_conf.txt b/ohos/images/mkimage/debug/eng_system_image_conf.txt new file mode 100755 index 0000000000000000000000000000000000000000..6b88a63bf2dee8f1502f0f14d829b136e25a52e2 --- /dev/null +++ b/ohos/images/mkimage/debug/eng_system_image_conf.txt @@ -0,0 +1,5 @@ +/eng_system +16777216 +--fs_type=ext4 +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux/file_contexts.bin diff --git a/ohos/images/mkimage/eng_chipset_image_conf.txt b/ohos/images/mkimage/eng_chipset_image_conf.txt new file mode 100755 index 0000000000000000000000000000000000000000..051d37a240ac9acb3b520ba574a8c1334642ccd4 --- /dev/null +++ b/ohos/images/mkimage/eng_chipset_image_conf.txt @@ -0,0 +1,5 @@ +/eng_chipset +16777216 +--fs_type=ext4 +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux/file_contexts.bin diff --git a/ohos/images/mkimage/eng_system_image_conf.txt b/ohos/images/mkimage/eng_system_image_conf.txt new file mode 100755 index 0000000000000000000000000000000000000000..6b88a63bf2dee8f1502f0f14d829b136e25a52e2 --- /dev/null +++ b/ohos/images/mkimage/eng_system_image_conf.txt @@ -0,0 +1,5 @@ +/eng_system +16777216 +--fs_type=ext4 +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux/file_contexts.bin diff --git a/ohos/images/mkimage/mkimages.py b/ohos/images/mkimage/mkimages.py index 28d20d2c19502e07d62bbb551c2a6f91c8eeb956..c6a451d812517d383f4723b5ab7f3c798b009ef3 100755 --- a/ohos/images/mkimage/mkimages.py +++ b/ohos/images/mkimage/mkimages.py @@ -121,7 +121,7 @@ def mk_images(args): device = args[2] is_sparse = args[3] mkfs_tools, mk_configs, _ = load_config(config_file) - if "system.img" in device: + if "/system.img" in device: mk_system_img(mkfs_tools, mk_configs, device, src_dir, is_sparse) elif "ramdisk.img" == device: mk_ramdisk_img(mkfs_tools, mk_configs, device, src_dir, is_sparse) diff --git a/ohos/packages/modules_install.py b/ohos/packages/modules_install.py index 1ce608332bc1c6d7281a8ef5bf0b9cca2364be00..6b2798baf80edcbab7c3e11a97c20ea25181278a 100755 --- a/ohos/packages/modules_install.py +++ b/ohos/packages/modules_install.py @@ -186,6 +186,18 @@ def main(): shutil.rmtree(vendor_install_base_dir) print('remove vendor dir...') + eng_system_install_base_dir = os.path.join(args.platform_installed_path, + 'eng_system') + if os.path.exists(eng_system_install_base_dir): + shutil.rmtree(eng_system_install_base_dir) + print('remove eng_system dir...') + + eng_chipset_install_base_dir = os.path.join(args.platform_installed_path, + 'eng_chipset') + if os.path.exists(eng_chipset_install_base_dir): + shutil.rmtree(eng_chipset_install_base_dir) + print('remove eng_chipset dir...') + sys_prod_install_base_dir = os.path.join(args.platform_installed_path, 'sys_prod') if os.path.exists(sys_prod_install_base_dir): diff --git a/ohos_var.gni b/ohos_var.gni index 8db452613e15e6c4c24ca55bf88840ec218cb8c7..77197dc01199e3e68700fe62117ae51b6c5f6427 100755 --- a/ohos_var.gni +++ b/ohos_var.gni @@ -55,6 +55,12 @@ declare_args() { # sys_prod package dir sys_prod_base_dir = "sys_prod" + # eng_system package dir + eng_system_base_dir = "eng_system" + + # eng_chipset package dir + eng_chipset_base_dir = "eng_chipset" + # chip_prod package dir chip_prod_base_dir = "chip_prod" diff --git a/templates/metadata/gen_module_info.py b/templates/metadata/gen_module_info.py index 5de3b1a67a80e6f9ced38153ca8dfd999bdf05fa..7bf568eb691a58141adbdcaa316b71791b1505a4 100755 --- a/templates/metadata/gen_module_info.py +++ b/templates/metadata/gen_module_info.py @@ -59,7 +59,8 @@ def _gen_install_dest(base_dir, module_install_dir, relative_install_dir, def gen_install_dests(system_base_dir, ramdisk_base_dir, vendor_base_dir, updater_base_dir, - updater_vendor_base_dir, sys_prod_base_dir, chip_prod_base_dir, source_file_name, install_images, + updater_vendor_base_dir, sys_prod_base_dir, chip_prod_base_dir, + eng_system_base_dir, eng_chipset_base_dir, source_file_name, install_images, module_install_dir, relative_install_dir, module_type): """Generate module install dir by user config.""" dests = [] @@ -88,6 +89,12 @@ def gen_install_dests(system_base_dir, ramdisk_base_dir, vendor_base_dir, update elif image == 'chip_prod': dest = _gen_install_dest(chip_prod_base_dir, module_install_dir, relative_install_dir, module_type) + elif image == 'eng_system': + dest = _gen_install_dest(eng_system_base_dir, module_install_dir, + relative_install_dir, module_type) + elif image == 'eng_chipset': + dest = _gen_install_dest(eng_chipset_base_dir, module_install_dir, + relative_install_dir, module_type) dests.append(os.path.join(dest, source_file_name)) return dests @@ -133,6 +140,8 @@ def main(): parser.add_argument('--vendor-base-dir', required=True) parser.add_argument('--updater-base-dir', required=True) parser.add_argument('--updater_vendor-base-dir', required=True) + parser.add_argument('--eng_system-base-dir', required=True) + parser.add_argument('--eng_chipset-base-dir', required=True) parser.add_argument('--sys_prod-base-dir', required=True) parser.add_argument('--chip_prod-base-dir', required=True) parser.add_argument('--label-name', help='module name', required=True) @@ -193,7 +202,8 @@ def main(): if args.install_images: install_dests = gen_install_dests( args.system_base_dir, args.ramdisk_base_dir, args.vendor_base_dir, args.updater_base_dir, - args.updater_vendor_base_dir, args.sys_prod_base_dir, args.chip_prod_base_dir, source_file_name, + args.updater_vendor_base_dir, args.sys_prod_base_dir, args.chip_prod_base_dir, + args.eng_system_base_dir, args.eng_chipset_base_dir, source_file_name, args.install_images, args.module_install_dir, args.relative_install_dir, args.type) module_info_data = gen_module_info(args.type, args.target_label, diff --git a/templates/metadata/module_info.gni b/templates/metadata/module_info.gni index 0e69f372f292914522303a2427edac186c0fe96b..0e7ab9a9699905f1edff250f3ddd46fff2c8235f 100755 --- a/templates/metadata/module_info.gni +++ b/templates/metadata/module_info.gni @@ -102,6 +102,10 @@ template("generate_module_info") { updater_base_dir, "--sys_prod-base-dir", sys_prod_base_dir, + "--eng_system-base-dir", + eng_system_base_dir, + "--eng_chipset-base-dir", + eng_chipset_base_dir, "--updater_vendor-base-dir", updater_vendor_base_dir, "--chip_prod-base-dir",