From 12e5d0b01ec3705a62eea3902a873814768f503e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=87=E8=BF=AA?= Date: Tue, 10 May 2022 11:21:02 +0800 Subject: [PATCH] =?UTF-8?q?e2fsprogs=20=E9=83=A8=E4=BB=B6=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张文迪 --- bundle.json | 6 ++-- contrib/android/BUILD.gn | 8 ++--- 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/host/bin/e2fsck | Bin prebuilt/host/bin/e2fsdroid | Bin prebuilt/host/bin/mke2fs | Bin prebuilt/target/BUILD.gn | 44 ++++++++++++------------- prebuilt/target/bin/e2fsck | Bin prebuilt/target/bin/e2fsdroid | Bin prebuilt/target/bin/mke2fs | Bin prebuilt/target/lib/libcrypto.so | Bin prebuilt/target/lib/libext2_blkid.so | Bin prebuilt/target/lib/libext2_com_err.so | Bin prebuilt/target/lib/libext2_e2p.so | Bin prebuilt/target/lib/libext2_misc.so | Bin prebuilt/target/lib/libext2_quota.so | Bin prebuilt/target/lib/libext2_uuid.so | Bin prebuilt/target/lib/libext2fs.so | Bin resize/BUILD.gn | 4 +-- 26 files changed, 50 insertions(+), 48 deletions(-) mode change 100755 => 100644 prebuilt/host/bin/e2fsck mode change 100755 => 100644 prebuilt/host/bin/e2fsdroid mode change 100755 => 100644 prebuilt/host/bin/mke2fs mode change 100755 => 100644 prebuilt/target/bin/e2fsck mode change 100755 => 100644 prebuilt/target/bin/e2fsdroid mode change 100755 => 100644 prebuilt/target/bin/mke2fs mode change 100755 => 100644 prebuilt/target/lib/libcrypto.so mode change 100755 => 100644 prebuilt/target/lib/libext2_blkid.so mode change 100755 => 100644 prebuilt/target/lib/libext2_com_err.so mode change 100755 => 100644 prebuilt/target/lib/libext2_e2p.so mode change 100755 => 100644 prebuilt/target/lib/libext2_misc.so mode change 100755 => 100644 prebuilt/target/lib/libext2_quota.so mode change 100755 => 100644 prebuilt/target/lib/libext2_uuid.so mode change 100755 => 100644 prebuilt/target/lib/libext2fs.so diff --git a/bundle.json b/bundle.json index d4d183ab..46ecf529 100644 --- a/bundle.json +++ b/bundle.json @@ -15,7 +15,7 @@ }, "component": { "name": "thirdparty_e2fsprogs", - "subsystem": "", + "subsystem": "thirdparty", "syscap": [], "features": [], "adapted_system_type": [], @@ -26,7 +26,9 @@ "third_party": [] }, "build": { - "sub_component": [], + "sub_component": [ + "//third_party/e2fsprogs:e2fsprogs" + ], "inner_kits": [], "test": [] } diff --git a/contrib/android/BUILD.gn b/contrib/android/BUILD.gn index c669cdb5..cb07d38a 100644 --- a/contrib/android/BUILD.gn +++ b/contrib/android/BUILD.gn @@ -20,8 +20,8 @@ ohos_static_library("libdacconfig") { sources = [ "dac_config.cpp" ] - part_name = "e2fsprogs" - subsystem_name = "distributeddatamgr" + part_name = "thirdparty_e2fsprogs" + subsystem_name = "thirdparty" } config("e2fsprogs-defaults") { cflags = [ @@ -63,8 +63,8 @@ ohos_executable("e2fsdroid") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/e2fsck/BUILD.gn b/e2fsck/BUILD.gn index 25726e81..9db5d686 100644 --- a/e2fsck/BUILD.gn +++ b/e2fsck/BUILD.gn @@ -64,8 +64,8 @@ ohos_executable("e2fsck") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/blkid/BUILD.gn b/lib/blkid/BUILD.gn index aeddb50d..d8d926de 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 = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/e2p/BUILD.gn b/lib/e2p/BUILD.gn index 7cf4c250..b21cb7d7 100644 --- a/lib/e2p/BUILD.gn +++ b/lib/e2p/BUILD.gn @@ -59,8 +59,8 @@ ohos_shared_library("libext2_e2p") { "-Wno-unused-parameter", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/et/BUILD.gn b/lib/et/BUILD.gn index 59c85607..13d80f02 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 = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/ext2fs/BUILD.gn b/lib/ext2fs/BUILD.gn index f6a001bf..00c20427 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 = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/support/BUILD.gn b/lib/support/BUILD.gn index 0716e590..137868c4 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 = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/uuid/BUILD.gn b/lib/uuid/BUILD.gn index 4e36c91e..4a124e65 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 = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/misc/BUILD.gn b/misc/BUILD.gn index 3048e2a3..4a841a90 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 = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", @@ -73,8 +73,8 @@ ohos_executable("mke2fs") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", diff --git a/prebuilt/host/bin/e2fsck b/prebuilt/host/bin/e2fsck old mode 100755 new mode 100644 diff --git a/prebuilt/host/bin/e2fsdroid b/prebuilt/host/bin/e2fsdroid old mode 100755 new mode 100644 diff --git a/prebuilt/host/bin/mke2fs b/prebuilt/host/bin/mke2fs old mode 100755 new mode 100644 diff --git a/prebuilt/target/BUILD.gn b/prebuilt/target/BUILD.gn index 464fec4c..0a90e87c 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" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_executable("e2fsdroid") { source = "bin/e2fsdroid" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_executable("e2fsck") { source = "bin/e2fsck" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_blkid") { source = "lib/libext2_blkid.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_com_err") { source = "lib/libext2_com_err.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_e2p") { source = "lib/libext2_e2p.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2fs") { source = "lib/libext2fs.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_misc") { source = "lib/libext2_misc.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_quota") { source = "lib/libext2_quota.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_uuid") { source = "lib/libext2_uuid.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libcrypto") { source = "lib/libcrypto.so" - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_enable = true } diff --git a/prebuilt/target/bin/e2fsck b/prebuilt/target/bin/e2fsck old mode 100755 new mode 100644 diff --git a/prebuilt/target/bin/e2fsdroid b/prebuilt/target/bin/e2fsdroid old mode 100755 new mode 100644 diff --git a/prebuilt/target/bin/mke2fs b/prebuilt/target/bin/mke2fs old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libcrypto.so b/prebuilt/target/lib/libcrypto.so old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libext2_blkid.so b/prebuilt/target/lib/libext2_blkid.so old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libext2_com_err.so b/prebuilt/target/lib/libext2_com_err.so old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libext2_e2p.so b/prebuilt/target/lib/libext2_e2p.so old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libext2_misc.so b/prebuilt/target/lib/libext2_misc.so old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libext2_quota.so b/prebuilt/target/lib/libext2_quota.so old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libext2_uuid.so b/prebuilt/target/lib/libext2_uuid.so old mode 100755 new mode 100644 diff --git a/prebuilt/target/lib/libext2fs.so b/prebuilt/target/lib/libext2fs.so old mode 100755 new mode 100644 diff --git a/resize/BUILD.gn b/resize/BUILD.gn index 9d85dd9b..b0792f0c 100755 --- a/resize/BUILD.gn +++ b/resize/BUILD.gn @@ -52,8 +52,8 @@ ohos_executable("resize2fs") { ldflags = [ "-stdlib=libc++_static" ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "e2fsprogs" + subsystem_name = "thirdparty" + part_name = "thirdparty_e2fsprogs" install_images = [ "system", "updater", -- Gitee