From 6cbe537c5c8fed7c285e72ccbf40d5344f039bc0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 May 2023 14:41:23 +0800 Subject: [PATCH 1/6] add libbegetutil_static as innerkits Signed-off-by: unknown --- bundle.json | 19 +++++++++++++++++++ interfaces/innerkits/BUILD.gn | 25 +++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 1fadcddbd..8d9334158 100755 --- a/bundle.json +++ b/bundle.json @@ -128,6 +128,25 @@ ] }, "name": "//base/startup/init/interfaces/innerkits/seccomp:seccomp" + }, + { + "header": { + "header_base": "//base/startup/init/interfaces/innerkits/include/", + "header_files": [ + "init_socket.h", + "init_file.h", + "init_reboot.h", + "service_control.h", + "beget_ext.h", + "systemcapability.h", + "syspara/parameter.h", + "syspara/parameters.h", + "syspara/param_wrapper.h", + "syspara/sysparam_errno.h", + "syspara/sysversion.h" + ] + }, + "name": "//base/startup/init/interfaces/innerkits:libbegetutil_static" } ], "test": [ diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index b042d67fb..e8a46d3fc 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -282,8 +282,16 @@ if (defined(ohos_lite)) { } ohos_static_library("libbegetutil_static") { - sources = syspara_sources + sources = [ + "fd_holder/fd_holder.c", + "reboot/init_reboot_innerkits.c", + "service_control/service_control.c", + ] + sources += syspara_sources sources += [ "syspara/param_wrapper.cpp" ] + sources += modulemgr_sources + + version_script = "libbegetutil.versionscript" defines = [ "INIT_AGENT", @@ -295,20 +303,33 @@ if (defined(ohos_lite)) { include_dirs = include_common deps = [ + "//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static", + "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd", + "//base/startup/init/interfaces/innerkits/fd_holder:fdholder", + "//base/startup/init/interfaces/innerkits/file:libfile", + "//base/startup/init/interfaces/innerkits/socket:libsocket", "//base/startup/init/services/log:agent_log", "//base/startup/init/services/loopevent:loopevent", "//base/startup/init/services/modules/udid:libudidcomm", "//base/startup/init/services/param/linux:param_client", - "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", ] deps += [ "//base/startup/init/services/param/base:param_base" ] + if (startup_begetutil_extra_modules != "") { + deps += [ startup_begetutil_extra_modules ] + } + external_deps = [ "c_utils:utils", "hilog_native:libhilog_base", ] + public_configs = [ ":exported_header_files" ] part_name = "init" subsystem_name = "startup" + install_images = [ + "system", + "updater", + ] } } -- Gitee From 3104f5f4c56171d34eac1df8835afb1a494ba74e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 May 2023 14:41:23 +0800 Subject: [PATCH 2/6] add libbegetutil_static as innerkits Signed-off-by: unknown --- bundle.json | 19 +++++++++++++++++++ interfaces/innerkits/BUILD.gn | 24 ++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 1fadcddbd..8d9334158 100755 --- a/bundle.json +++ b/bundle.json @@ -128,6 +128,25 @@ ] }, "name": "//base/startup/init/interfaces/innerkits/seccomp:seccomp" + }, + { + "header": { + "header_base": "//base/startup/init/interfaces/innerkits/include/", + "header_files": [ + "init_socket.h", + "init_file.h", + "init_reboot.h", + "service_control.h", + "beget_ext.h", + "systemcapability.h", + "syspara/parameter.h", + "syspara/parameters.h", + "syspara/param_wrapper.h", + "syspara/sysparam_errno.h", + "syspara/sysversion.h" + ] + }, + "name": "//base/startup/init/interfaces/innerkits:libbegetutil_static" } ], "test": [ diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index b042d67fb..22ad6811e 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -282,9 +282,16 @@ if (defined(ohos_lite)) { } ohos_static_library("libbegetutil_static") { - sources = syspara_sources + sources = [ + "fd_holder/fd_holder.c", + "reboot/init_reboot_innerkits.c", + "service_control/service_control.c", + ] + sources += syspara_sources sources += [ "syspara/param_wrapper.cpp" ] + sources += modulemgr_sources + defines = [ "INIT_AGENT", "_GNU_SOURCE", @@ -295,20 +302,33 @@ if (defined(ohos_lite)) { include_dirs = include_common deps = [ + "//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static", + "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd", + "//base/startup/init/interfaces/innerkits/fd_holder:fdholder", + "//base/startup/init/interfaces/innerkits/file:libfile", + "//base/startup/init/interfaces/innerkits/socket:libsocket", "//base/startup/init/services/log:agent_log", "//base/startup/init/services/loopevent:loopevent", "//base/startup/init/services/modules/udid:libudidcomm", "//base/startup/init/services/param/linux:param_client", - "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", ] deps += [ "//base/startup/init/services/param/base:param_base" ] + if (startup_begetutil_extra_modules != "") { + deps += [ startup_begetutil_extra_modules ] + } + external_deps = [ "c_utils:utils", "hilog_native:libhilog_base", ] + public_configs = [ ":exported_header_files" ] part_name = "init" subsystem_name = "startup" + install_images = [ + "system", + "updater", + ] } } -- Gitee From 5803248d356a3c2fd224ce48c048bb926b476bc2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 May 2023 15:05:17 +0800 Subject: [PATCH 3/6] add libbegetutil_static as innerkits Signed-off-by: unknown --- interfaces/innerkits/BUILD.gn | 3 --- 1 file changed, 3 deletions(-) diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index c8cb6d331..22ad6811e 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -289,9 +289,6 @@ if (defined(ohos_lite)) { ] sources += syspara_sources sources += [ "syspara/param_wrapper.cpp" ] - sources += modulemgr_sources - - version_script = "libbegetutil.versionscript" sources += modulemgr_sources -- Gitee From a907e6981f40f7eeadb23649889bfd3197df398a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 May 2023 15:05:17 +0800 Subject: [PATCH 4/6] add libbegetutil_static as innerkits Signed-off-by: unknown --- interfaces/innerkits/BUILD.gn | 7 ------- 1 file changed, 7 deletions(-) diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index c8cb6d331..61ecf11f9 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -289,9 +289,6 @@ if (defined(ohos_lite)) { ] sources += syspara_sources sources += [ "syspara/param_wrapper.cpp" ] - sources += modulemgr_sources - - version_script = "libbegetutil.versionscript" sources += modulemgr_sources @@ -328,10 +325,6 @@ if (defined(ohos_lite)) { public_configs = [ ":exported_header_files" ] part_name = "init" subsystem_name = "startup" - install_images = [ - "system", - "updater", - ] } } -- Gitee From 1594f26d533848a7acbab4417ff1b6ccdad5dc19 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 24 Jul 2023 19:28:27 +0800 Subject: [PATCH 5/6] del so in updater_binary Signed-off-by: unknown --- bundle.json | 19 +++++++++++++++++++ interfaces/innerkits/BUILD.gn | 4 +++- interfaces/innerkits/fs_manager/BUILD.gn | 3 +-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index 1fadcddbd..f797c3724 100755 --- a/bundle.json +++ b/bundle.json @@ -91,6 +91,25 @@ }, "name": "//base/startup/init/interfaces/innerkits:libbegetutil" }, + { + "header": { + "header_base": "//base/startup/init/interfaces/innerkits/include/", + "header_files": [ + "init_socket.h", + "init_file.h", + "init_reboot.h", + "service_control.h", + "beget_ext.h", + "systemcapability.h", + "syspara/parameter.h", + "syspara/parameters.h", + "syspara/param_wrapper.h", + "syspara/sysparam_errno.h", + "syspara/sysversion.h" + ] + }, + "name": "//base/startup/init/interfaces/innerkits:libbegetutil_static" + }, { "header": { "header_base": "//base/startup/init/interfaces/innerkits/include/fs_manager/", diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index b042d67fb..f40144e9c 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -203,7 +203,7 @@ if (defined(ohos_lite)) { "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", ] - deps += [ "//base/startup/init/services/param/base:param_base" ] + if (startup_begetutil_extra_modules != "") { deps += [ startup_begetutil_extra_modules ] } @@ -284,6 +284,7 @@ if (defined(ohos_lite)) { ohos_static_library("libbegetutil_static") { sources = syspara_sources sources += [ "syspara/param_wrapper.cpp" ] + sources += [ "reboot/init_reboot_innerkits.c" ] defines = [ "INIT_AGENT", @@ -307,6 +308,7 @@ if (defined(ohos_lite)) { "c_utils:utils", "hilog_native:libhilog_base", ] + public_configs = [ ":exported_header_files" ] part_name = "init" subsystem_name = "startup" } diff --git a/interfaces/innerkits/fs_manager/BUILD.gn b/interfaces/innerkits/fs_manager/BUILD.gn index 21cc559d7..2daddc559 100755 --- a/interfaces/innerkits/fs_manager/BUILD.gn +++ b/interfaces/innerkits/fs_manager/BUILD.gn @@ -25,7 +25,6 @@ config("libfsmanager_exported_configs") { ohos_static_library("libfsmanager_static") { sources = [ - "//base/startup/init/services/utils/init_utils.c", "fstab.c", "fstab_mount.c", ] @@ -53,7 +52,7 @@ ohos_static_library("libfsmanager_static") { ] defines = [ "SUPPORT_HVB" ] - + deps = [ "//base/startup/init/services/utils:libinit_utils" ] public_deps = [ "//base/startup/hvb/libhvb:libhvb_static" ] } public_configs = [ ":libfsmanager_exported_configs" ] -- Gitee From 6c5f08f7125e14960930a978a63560c15643c809 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 24 Jul 2023 19:28:27 +0800 Subject: [PATCH 6/6] del so in updater_binary Signed-off-by: unknown --- bundle.json | 19 +++++++++++++++++++ interfaces/innerkits/BUILD.gn | 2 ++ interfaces/innerkits/fs_manager/BUILD.gn | 3 +-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 1fadcddbd..f797c3724 100755 --- a/bundle.json +++ b/bundle.json @@ -91,6 +91,25 @@ }, "name": "//base/startup/init/interfaces/innerkits:libbegetutil" }, + { + "header": { + "header_base": "//base/startup/init/interfaces/innerkits/include/", + "header_files": [ + "init_socket.h", + "init_file.h", + "init_reboot.h", + "service_control.h", + "beget_ext.h", + "systemcapability.h", + "syspara/parameter.h", + "syspara/parameters.h", + "syspara/param_wrapper.h", + "syspara/sysparam_errno.h", + "syspara/sysversion.h" + ] + }, + "name": "//base/startup/init/interfaces/innerkits:libbegetutil_static" + }, { "header": { "header_base": "//base/startup/init/interfaces/innerkits/include/fs_manager/", diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index b042d67fb..741a52e6d 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -284,6 +284,7 @@ if (defined(ohos_lite)) { ohos_static_library("libbegetutil_static") { sources = syspara_sources sources += [ "syspara/param_wrapper.cpp" ] + sources += [ "reboot/init_reboot_innerkits.c" ] defines = [ "INIT_AGENT", @@ -307,6 +308,7 @@ if (defined(ohos_lite)) { "c_utils:utils", "hilog_native:libhilog_base", ] + public_configs = [ ":exported_header_files" ] part_name = "init" subsystem_name = "startup" } diff --git a/interfaces/innerkits/fs_manager/BUILD.gn b/interfaces/innerkits/fs_manager/BUILD.gn index 21cc559d7..2daddc559 100755 --- a/interfaces/innerkits/fs_manager/BUILD.gn +++ b/interfaces/innerkits/fs_manager/BUILD.gn @@ -25,7 +25,6 @@ config("libfsmanager_exported_configs") { ohos_static_library("libfsmanager_static") { sources = [ - "//base/startup/init/services/utils/init_utils.c", "fstab.c", "fstab_mount.c", ] @@ -53,7 +52,7 @@ ohos_static_library("libfsmanager_static") { ] defines = [ "SUPPORT_HVB" ] - + deps = [ "//base/startup/init/services/utils:libinit_utils" ] public_deps = [ "//base/startup/hvb/libhvb:libhvb_static" ] } public_configs = [ ":libfsmanager_exported_configs" ] -- Gitee