From 48fb24d430a88c93e10f59b919db9011be8bfc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=87=E8=BF=AA?= Date: Thu, 18 Aug 2022 15:55:35 +0800 Subject: [PATCH] =?UTF-8?q?e2fsprogs=E9=83=A8=E4=BB=B6=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张文迪 --- BUILD.gn | 19 +++++++++++++------ bundle.json | 4 ++-- contrib/android/BUILD.gn | 6 +++--- e2fsck/BUILD.gn | 4 ++-- lib/blkid/BUILD.gn | 4 ++-- lib/e2p/BUILD.gn | 4 ++-- lib/et/BUILD.gn | 4 ++-- lib/ext2fs/BUILD.gn | 4 ++-- lib/support/BUILD.gn | 4 ++-- lib/uuid/BUILD.gn | 4 ++-- misc/BUILD.gn | 8 ++++---- prebuilt/target/BUILD.gn | 22 +++++++++++----------- resize/BUILD.gn | 4 ++-- 13 files changed, 49 insertions(+), 42 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 6e867c41..efa75f4c 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -3,7 +3,6 @@ import("//build/ohos.gni") group("e2fsprogs") { deps = [ "//third_party/e2fsprogs/e2fsck:e2fsck", - "//third_party/e2fsprogs/e2fsck:e2fsck($host_toolchain)", "//third_party/e2fsprogs/lib/blkid:libext2_blkid", "//third_party/e2fsprogs/lib/e2p:libext2_e2p", "//third_party/e2fsprogs/lib/et:libext2_com_err", @@ -13,14 +12,22 @@ group("e2fsprogs") { "//third_party/e2fsprogs/misc:blkid", "//third_party/e2fsprogs/misc:libext2_misc", "//third_party/e2fsprogs/misc:mke2fs", - "//third_party/e2fsprogs/misc:mke2fs($host_toolchain)", "//third_party/e2fsprogs/resize:resize2fs", ] if (target_cpu != "riscv64") { - deps += [ - "//third_party/e2fsprogs/contrib/android:e2fsdroid", - "//third_party/e2fsprogs/contrib/android:e2fsdroid($host_toolchain)", - ] + deps += [ "//third_party/e2fsprogs/contrib/android:e2fsdroid" ] + } + public_deps = [ "//third_party/boringssl:crypto" ] +} + +group("e2fsprogs_host_toolchain") { + deps = [ + "//third_party/e2fsprogs/e2fsck:e2fsck($host_toolchain)", + "//third_party/e2fsprogs/misc:mke2fs($host_toolchain)", + ] + if (target_cpu != "riscv64") { + deps += + [ "//third_party/e2fsprogs/contrib/android:e2fsdroid($host_toolchain)" ] } public_deps = [ "//third_party/boringssl:crypto" ] } diff --git a/bundle.json b/bundle.json index d4d183ab..177ace73 100644 --- a/bundle.json +++ b/bundle.json @@ -14,8 +14,8 @@ "en": "README" }, "component": { - "name": "thirdparty_e2fsprogs", - "subsystem": "", + "name": "e2fsprogs", + "subsystem": "thirdparty", "syscap": [], "features": [], "adapted_system_type": [], diff --git a/contrib/android/BUILD.gn b/contrib/android/BUILD.gn index cf08dd97..58cd3b1d 100644 --- a/contrib/android/BUILD.gn +++ b/contrib/android/BUILD.gn @@ -21,7 +21,7 @@ ohos_static_library("libdacconfig") { sources = [ "dac_config.cpp" ] part_name = "e2fsprogs" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" } config("e2fsprogs-defaults") { cflags = [ @@ -63,8 +63,8 @@ ohos_executable("e2fsdroid") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/e2fsck/BUILD.gn b/e2fsck/BUILD.gn index 006c37b1..07f460ec 100644 --- a/e2fsck/BUILD.gn +++ b/e2fsck/BUILD.gn @@ -65,8 +65,8 @@ ohos_executable("e2fsck") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/blkid/BUILD.gn b/lib/blkid/BUILD.gn index 0949c772..5117949a 100644 --- a/lib/blkid/BUILD.gn +++ b/lib/blkid/BUILD.gn @@ -53,8 +53,8 @@ ohos_shared_library("libext2_blkid") { "-fno-strict-aliasing", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/e2p/BUILD.gn b/lib/e2p/BUILD.gn index 7f265f6e..4b3c6a6d 100644 --- a/lib/e2p/BUILD.gn +++ b/lib/e2p/BUILD.gn @@ -60,8 +60,8 @@ ohos_shared_library("libext2_e2p") { "-Wno-unused-parameter", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/et/BUILD.gn b/lib/et/BUILD.gn index 2ef98767..5e2b0b59 100644 --- a/lib/et/BUILD.gn +++ b/lib/et/BUILD.gn @@ -39,8 +39,8 @@ ohos_shared_library("libext2_com_err") { ":libext2-headers", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/ext2fs/BUILD.gn b/lib/ext2fs/BUILD.gn index 63b75a7a..c2e0ba5e 100644 --- a/lib/ext2fs/BUILD.gn +++ b/lib/ext2fs/BUILD.gn @@ -121,8 +121,8 @@ ohos_shared_library("libext2fs") { "//third_party/e2fsprogs/lib", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/support/BUILD.gn b/lib/support/BUILD.gn index d923d58b..d45c4414 100644 --- a/lib/support/BUILD.gn +++ b/lib/support/BUILD.gn @@ -46,8 +46,8 @@ ohos_shared_library("libext2_quota") { "//third_party/e2fsprogs/lib/ext2fs:libext2fs", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/uuid/BUILD.gn b/lib/uuid/BUILD.gn index 4004af72..cbb0d4b8 100644 --- a/lib/uuid/BUILD.gn +++ b/lib/uuid/BUILD.gn @@ -44,8 +44,8 @@ ohos_shared_library("libext2_uuid") { ":libext2-headers", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/misc/BUILD.gn b/misc/BUILD.gn index ffa4d89b..662d7041 100644 --- a/misc/BUILD.gn +++ b/misc/BUILD.gn @@ -31,8 +31,8 @@ ohos_shared_library("libext2_misc") { "//third_party/e2fsprogs/lib/support:libext2_quota", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", @@ -73,8 +73,8 @@ ohos_executable("mke2fs") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/prebuilt/target/BUILD.gn b/prebuilt/target/BUILD.gn index 464fec4c..946a1926 100644 --- a/prebuilt/target/BUILD.gn +++ b/prebuilt/target/BUILD.gn @@ -2,77 +2,77 @@ import("//build/ohos.gni") ohos_prebuilt_executable("mke2fs") { source = "bin/mke2fs" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_executable("e2fsdroid") { source = "bin/e2fsdroid" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_executable("e2fsck") { source = "bin/e2fsck" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_blkid") { source = "lib/libext2_blkid.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_com_err") { source = "lib/libext2_com_err.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_e2p") { source = "lib/libext2_e2p.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2fs") { source = "lib/libext2fs.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_misc") { source = "lib/libext2_misc.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_quota") { source = "lib/libext2_quota.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_uuid") { source = "lib/libext2_uuid.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libcrypto") { source = "lib/libcrypto.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } diff --git a/resize/BUILD.gn b/resize/BUILD.gn index 960048f4..881c6a15 100755 --- a/resize/BUILD.gn +++ b/resize/BUILD.gn @@ -48,8 +48,8 @@ ohos_executable("resize2fs") { ldflags = [ "-stdlib=libc++_static" ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", -- Gitee