diff --git a/bundle.json b/bundle.json index d4d183abdddc90a81c1094c5b561d1f1d36da9eb..46ecf529e0965acee1e54c283f4a9be6d79be86c 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 c669cdb59a9f56dde409e30bee5a3f1c3168b098..cb07d38a4379f774aa7fd52e2b6fc0f2a900cfdb 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 25726e81484268cc0a6f5c0241904dbba05f8a21..9db5d686396d266e16ac35770d40eee57d94cd9b 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 aeddb50de699f29ac784dc11544ff535473518d0..d8d926de3a1584b3f529dc77d5f6536f7cb5dd9b 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 7cf4c250853f0ea75d16d65d4327f6a2107049ce..b21cb7d78116b9fae2e4bea709936c367a2d2847 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 59c8560793cb2550123265261dc9b9bc87b64ef3..13d80f02af9b41bb377a2240768f65f9637eeb42 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 f6a001bff93cdc5d51d87953ea1726a8f9eda5da..00c204275325cbb7e1fdd70ebe6ad4b479f1c5d3 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 0716e590a5223ac9347abeafb912c69545c22aff..137868c42f89adeec1bfa2de1b3676b7ac798a96 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 4e36c91ede2ff9f1dc74200a3703ad4c5559c1c1..4a124e65aa711efc674f2d8416083398ffb24077 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 3048e2a3797b09ce7ae89a12a7a2708dee579623..4a841a9094f880e2b7fdc5b5efc04f1e96b1efc4 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 464fec4c7ca2af51e5d8a4eeff0cc1f41092774b..0a90e87cb1cf28b6c6b5230475da1f9e58c7796d 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 9d85dd9bb6f40c1beaba4047a4df3c16f7ad6dcb..b0792f0cea09db4e1568e58e805cfa1a6a2f56f9 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",