mirror of
https://gitee.com/openharmony/startup_init
synced 2024-11-27 10:20:46 +00:00
fix_init_comp_none
Signed-off-by: chenshixu1 <chenshixu1@huawei.com> Change-Id: Id6867272e32b108b49c84ad879af1d15255dab49
This commit is contained in:
chenshixu1
parent
c85e912952
commit
69252d881b
@ -16,8 +16,7 @@
|
||||
"name": "init",
|
||||
"subsystem": "startup",
|
||||
"syscap": [
|
||||
"SystemCapability.Startup.SystemInfo",
|
||||
"SystemCapability.Startup.SystemInfo.Lite"
|
||||
"SystemCapability.Startup.SystemInfo"
|
||||
],
|
||||
"adapted_system_type": [
|
||||
"mini",
|
||||
@ -75,9 +74,7 @@
|
||||
],
|
||||
"service_group": [
|
||||
"//base/startup/init/watchdog:watchdog",
|
||||
"//base/startup/init/services/etc:watchdog.cfg",
|
||||
"//base/startup/init/ueventd:startup_ueventd",
|
||||
"//base/startup/init/services/etc:ueventd.cfg"
|
||||
"//base/startup/init/ueventd:startup_ueventd"
|
||||
]
|
||||
},
|
||||
"inner_kits": [
|
||||
|
||||
@ -328,5 +328,6 @@ group("innergroup") {
|
||||
"init_module_engine:modulegroup",
|
||||
"socket:libsocket",
|
||||
]
|
||||
} else {
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,37 +23,40 @@ config("libfsmanager_exported_configs") {
|
||||
}
|
||||
|
||||
ohos_static_library("libfsmanager_static") {
|
||||
sources = [
|
||||
"//base/startup/init/services/utils/init_utils.c",
|
||||
"fstab.c",
|
||||
"fstab_mount.c",
|
||||
]
|
||||
include_dirs = [
|
||||
"//base/startup/init/interfaces/innerkits/include",
|
||||
"//third_party/bounds_checking_function/include",
|
||||
"//base/startup/init/interfaces/innerkits/include/param",
|
||||
"//base/startup/init/services/log",
|
||||
"//base/startup/init/services/param/include",
|
||||
]
|
||||
if (defined(global_parts_info.startup_hvb)) {
|
||||
sources += [
|
||||
"dm_verity/dm_verity.c",
|
||||
"libfs_dm/fs_dm.c",
|
||||
"libfs_hvb/fs_hvb.c",
|
||||
"libfs_hvb/hvb_ops.c",
|
||||
if (!defined(ohos_lite)) {
|
||||
sources = [
|
||||
"//base/startup/init/services/utils/init_utils.c",
|
||||
"fstab.c",
|
||||
"fstab_mount.c",
|
||||
]
|
||||
|
||||
include_dirs += [
|
||||
"//base/startup/init/interfaces/innerkits/fs_manager/libfs_dm/include",
|
||||
"//base/startup/init/interfaces/innerkits/fs_manager/libfs_hvb/include",
|
||||
"//base/startup/init/interfaces/innerkits/fs_manager/dm_verity/include",
|
||||
"//base/startup/hvb/libhvb/include",
|
||||
"//base/startup/init/ueventd/include",
|
||||
include_dirs = [
|
||||
"//base/startup/init/interfaces/innerkits/include",
|
||||
"//third_party/bounds_checking_function/include",
|
||||
"//base/startup/init/interfaces/innerkits/include/param",
|
||||
"//base/startup/init/services/log",
|
||||
"//base/startup/init/services/param/include",
|
||||
]
|
||||
if (defined(global_parts_info.startup_hvb)) {
|
||||
sources += [
|
||||
"dm_verity/dm_verity.c",
|
||||
"libfs_dm/fs_dm.c",
|
||||
"libfs_hvb/fs_hvb.c",
|
||||
"libfs_hvb/hvb_ops.c",
|
||||
]
|
||||
|
||||
defines = [ "SUPPORT_HVB" ]
|
||||
external_deps = [ "hvb:libhvb_static" ]
|
||||
include_dirs += [
|
||||
"//base/startup/init/interfaces/innerkits/fs_manager/libfs_dm/include",
|
||||
"//base/startup/init/interfaces/innerkits/fs_manager/libfs_hvb/include",
|
||||
"//base/startup/init/interfaces/innerkits/fs_manager/dm_verity/include",
|
||||
"//base/startup/hvb/libhvb/include",
|
||||
"//base/startup/init/ueventd/include",
|
||||
]
|
||||
|
||||
defines = [ "SUPPORT_HVB" ]
|
||||
external_deps = [ "hvb:libhvb_static" ]
|
||||
}
|
||||
}
|
||||
|
||||
public_configs = [ ":libfsmanager_exported_configs" ]
|
||||
part_name = "init"
|
||||
subsystem_name = "startup"
|
||||
|
||||
@ -24,40 +24,42 @@ if (defined(build_seccomp) && build_seccomp) {
|
||||
seccomp_enable_debug = false
|
||||
}
|
||||
|
||||
ohos_shared_library("seccomp") {
|
||||
sources = [ "../../../services/modules/seccomp/seccomp_policy.c" ]
|
||||
if (!defined(ohos_lite)) {
|
||||
ohos_shared_library("seccomp") {
|
||||
sources = [ "../../../services/modules/seccomp/seccomp_policy.c" ]
|
||||
|
||||
public_configs = [ ":seccomp_public_config" ]
|
||||
public_configs = [ ":seccomp_public_config" ]
|
||||
|
||||
include_dirs = [
|
||||
"../include",
|
||||
"../../../services/modules",
|
||||
"../../../services/log",
|
||||
]
|
||||
|
||||
if (seccomp_enable_debug) {
|
||||
include_dirs += [
|
||||
"../../../interfaces/innerkits/include",
|
||||
"../../../interfaces/innerkits/include/param",
|
||||
include_dirs = [
|
||||
"../include",
|
||||
"../../../services/modules",
|
||||
"../../../services/log",
|
||||
]
|
||||
|
||||
defines = [ "WITH_SECCOMP_DEBUG" ]
|
||||
if (seccomp_enable_debug) {
|
||||
include_dirs += [
|
||||
"../../../interfaces/innerkits/include",
|
||||
"../../../interfaces/innerkits/include/param",
|
||||
]
|
||||
|
||||
defines = [ "WITH_SECCOMP_DEBUG" ]
|
||||
}
|
||||
|
||||
deps = [ "../../innerkits:libbegetutil" ]
|
||||
|
||||
external_deps = [
|
||||
"bounds_checking_function:libsec_shared",
|
||||
"config_policy:configpolicy_util",
|
||||
]
|
||||
|
||||
license_file = "//base/startup/init/LICENSE"
|
||||
|
||||
part_name = "init"
|
||||
subsystem_name = "startup"
|
||||
|
||||
install_enable = true
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
|
||||
deps = [ "../../innerkits:libbegetutil" ]
|
||||
|
||||
external_deps = [
|
||||
"bounds_checking_function:libsec_shared",
|
||||
"config_policy:configpolicy_util",
|
||||
]
|
||||
|
||||
license_file = "//base/startup/init/LICENSE"
|
||||
|
||||
part_name = "init"
|
||||
subsystem_name = "startup"
|
||||
|
||||
install_enable = true
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
} else {
|
||||
group("seccomp") {
|
||||
|
||||
@ -35,6 +35,8 @@ group("startup_init") {
|
||||
"init/standard:init_early",
|
||||
"//third_party/e2fsprogs:e2fsprogs",
|
||||
]
|
||||
deps += [ "//base/startup/init/services/etc:watchdog.cfg" ]
|
||||
deps += [ "//base/startup/init/services/etc:ueventd.cfg" ]
|
||||
|
||||
if (use_musl) {
|
||||
deps += [ "//third_party/f2fs-tools:f2fs-tools" ]
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
{
|
||||
"name": "@ohos/init_lite",
|
||||
"description": "ohos init lite process",
|
||||
"homePage": "https://gitee.com/openharmony",
|
||||
"version": "3.1",
|
||||
"license": "Apache License 2.0",
|
||||
"repository": "https://gitee.com/openharmony/startup_init_lite",
|
||||
"publishAs": "code-segment",
|
||||
"segment": {
|
||||
"destPath": "base/startup/init"
|
||||
},
|
||||
"dirs": {},
|
||||
"scripts": {},
|
||||
"component": {
|
||||
"name": "init_lite",
|
||||
"subsystem": "startup",
|
||||
"adapted_system_type": [
|
||||
"small"
|
||||
],
|
||||
"rom": "31KB",
|
||||
"ram": "~200KB",
|
||||
"deps": {
|
||||
"components": [
|
||||
],
|
||||
"third_party": [
|
||||
"cJSON",
|
||||
"bounds_checking_function"
|
||||
]
|
||||
},
|
||||
"build": {
|
||||
"sub_component": [
|
||||
"//base/startup/init/services:startup_init",
|
||||
"//base/startup/init/ueventd:startup_ueventd",
|
||||
"//base/startup/init/watchdog:watchdog",
|
||||
"//base/startup/init/services/begetctl:begetctl_cmd",
|
||||
"//base/startup/init/services/loopevent:loopeventgroup",
|
||||
"//base/startup/init/services/modules:modulesgroup",
|
||||
"//base/startup/init/services/param:parameter"
|
||||
],
|
||||
"inner_kits": [
|
||||
{
|
||||
"header": {
|
||||
"header_base": "//base/startup/init/interfaces/innerkits/include/",
|
||||
"header_files": [
|
||||
"beget_ext.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"
|
||||
}
|
||||
],
|
||||
"test": [
|
||||
"//base/startup/init/test:testgroup"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user