Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Startup Init Lite
提交
5044f269
S
Startup Init Lite
项目概览
OpenHarmony
/
Startup Init Lite
大约 1 年 前同步成功
通知
3
Star
37
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Startup Init Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
5044f269
编写于
7月 03, 2023
作者:
O
openharmony_ci
提交者:
Gitee
7月 03, 2023
浏览文件
操作
浏览文件
下载
差异文件
!2087 init---修改selinux仓名
Merge pull request !2087 from steven_Q/master
上级
d4b2f7f3
352c6f00
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
25 addition
and
25 deletion
+25
-25
bundle.json
bundle.json
+1
-1
services/begetctl/BUILD.gn
services/begetctl/BUILD.gn
+4
-4
services/init/standard/BUILD.gn
services/init/standard/BUILD.gn
+3
-3
services/modules/bootevent/BUILD.gn
services/modules/bootevent/BUILD.gn
+1
-1
services/modules/init_context/BUILD.gn
services/modules/init_context/BUILD.gn
+2
-2
services/modules/init_hook/BUILD.gn
services/modules/init_hook/BUILD.gn
+1
-1
services/modules/selinux/BUILD.gn
services/modules/selinux/BUILD.gn
+4
-4
services/param/base/BUILD.gn
services/param/base/BUILD.gn
+4
-4
services/param/linux/BUILD.gn
services/param/linux/BUILD.gn
+2
-2
test/unittest/BUILD.gn
test/unittest/BUILD.gn
+1
-1
ueventd/BUILD.gn
ueventd/BUILD.gn
+2
-2
未找到文件。
bundle.json
浏览文件 @
5044f269
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
"thirdparty_bounds_checking_function"
,
"thirdparty_bounds_checking_function"
,
"samgr"
,
"samgr"
,
"hiviewdfx_hilog_native"
,
"hiviewdfx_hilog_native"
,
"selinux"
,
"selinux
_adapter
"
,
"hiviewdfx"
,
"hiviewdfx"
,
"access_token"
,
"access_token"
,
"common"
,
"common"
,
...
...
services/begetctl/BUILD.gn
浏览文件 @
5044f269
...
@@ -26,7 +26,7 @@ common_include_dirs = [
...
@@ -26,7 +26,7 @@ common_include_dirs = [
"//base/startup/init/services/log",
"//base/startup/init/services/log",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init/interfaces/innerkits/include/syspara",
"//base/security/selinux/interfaces/policycoreutils/include",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include",
"//third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
"//third_party/selinux/libselinux/include",
"//third_party/selinux/libselinux/include",
]
]
...
@@ -113,7 +113,7 @@ if (defined(ohos_lite)) {
...
@@ -113,7 +113,7 @@ if (defined(ohos_lite)) {
if (build_selinux) {
if (build_selinux) {
deps += [
deps += [
"//base/security/selinux:libselinux_parameter_static",
"//base/security/selinux
_adapter
:libselinux_parameter_static",
"//third_party/selinux:libselinux",
"//third_party/selinux:libselinux",
]
]
defines += [ "PARAM_SUPPORT_SELINUX" ]
defines += [ "PARAM_SUPPORT_SELINUX" ]
...
@@ -158,7 +158,7 @@ if (defined(ohos_lite)) {
...
@@ -158,7 +158,7 @@ if (defined(ohos_lite)) {
if (build_selinux) {
if (build_selinux) {
deps += [
deps += [
"//base/security/selinux:libselinux_parameter_static",
"//base/security/selinux
_adapter
:libselinux_parameter_static",
"//third_party/selinux:libselinux",
"//third_party/selinux:libselinux",
]
]
defines += [ "PARAM_SUPPORT_SELINUX" ]
defines += [ "PARAM_SUPPORT_SELINUX" ]
...
@@ -210,7 +210,7 @@ if (defined(ohos_lite)) {
...
@@ -210,7 +210,7 @@ if (defined(ohos_lite)) {
]
]
if (build_selinux) {
if (build_selinux) {
deps += [
deps += [
"//base/security/selinux:libselinux_parameter_static",
"//base/security/selinux
_adapter
:libselinux_parameter_static",
"//third_party/selinux:libselinux",
"//third_party/selinux:libselinux",
]
]
defines += [ "PARAM_SUPPORT_SELINUX" ]
defines += [ "PARAM_SUPPORT_SELINUX" ]
...
...
services/init/standard/BUILD.gn
浏览文件 @
5044f269
...
@@ -107,12 +107,12 @@ ohos_executable("init") {
...
@@ -107,12 +107,12 @@ ohos_executable("init") {
if (build_selinux) {
if (build_selinux) {
include_dirs += [
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
deps += [ "//third_party/selinux:libselinux" ]
deps += [ "//third_party/selinux:libselinux" ]
external_deps += [
external_deps += [
"selinux:libload_policy",
"selinux
_adapter
:libload_policy",
"selinux:librestorecon",
"selinux
_adapter
:librestorecon",
]
]
cflags += [ "-DWITH_SELINUX" ]
cflags += [ "-DWITH_SELINUX" ]
}
}
...
...
services/modules/bootevent/BUILD.gn
浏览文件 @
5044f269
...
@@ -33,7 +33,7 @@ ohos_source_set("libbootevent_static") {
...
@@ -33,7 +33,7 @@ ohos_source_set("libbootevent_static") {
if (build_selinux) {
if (build_selinux) {
include_dirs += [
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
"//base/startup/init/services/include/param",
"//base/startup/init/services/include/param",
]
]
defines = [ "WITH_SELINUX" ]
defines = [ "WITH_SELINUX" ]
...
...
services/modules/init_context/BUILD.gn
浏览文件 @
5044f269
...
@@ -34,8 +34,8 @@ ohos_shared_library("init_context") {
...
@@ -34,8 +34,8 @@ ohos_shared_library("init_context") {
defines = [ "INIT_SUPPORT_CHIPSET_INIT" ]
defines = [ "INIT_SUPPORT_CHIPSET_INIT" ]
if (build_selinux) {
if (build_selinux) {
external_deps += [
external_deps += [
"selinux:libload_policy",
"selinux
_adapter
:libload_policy",
"selinux:librestorecon",
"selinux
_adapter
:librestorecon",
]
]
defines += [ "WITH_SELINUX" ]
defines += [ "WITH_SELINUX" ]
}
}
...
...
services/modules/init_hook/BUILD.gn
浏览文件 @
5044f269
...
@@ -52,7 +52,7 @@ if (defined(ohos_lite)) {
...
@@ -52,7 +52,7 @@ if (defined(ohos_lite)) {
if (build_selinux) {
if (build_selinux) {
include_dirs += [
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
defines += [ "WITH_SELINUX" ]
defines += [ "WITH_SELINUX" ]
}
}
...
...
services/modules/selinux/BUILD.gn
浏览文件 @
5044f269
...
@@ -23,7 +23,7 @@ ohos_shared_library("selinuxadp") {
...
@@ -23,7 +23,7 @@ ohos_shared_library("selinuxadp") {
"../init_hook",
"../init_hook",
"//base/startup/init/services/include/param",
"//base/startup/init/services/include/param",
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
deps = [
deps = [
"//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
"//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
...
@@ -32,8 +32,8 @@ ohos_shared_library("selinuxadp") {
...
@@ -32,8 +32,8 @@ ohos_shared_library("selinuxadp") {
]
]
external_deps = [
external_deps = [
"selinux:libload_policy",
"selinux
_adapter
:libload_policy",
"selinux:librestorecon",
"selinux
_adapter
:librestorecon",
]
]
part_name = "init"
part_name = "init"
...
@@ -62,7 +62,7 @@ ohos_source_set("libselinuxadp_static") {
...
@@ -62,7 +62,7 @@ ohos_source_set("libselinuxadp_static") {
"../init_hook",
"../init_hook",
"//base/startup/init/services/include/param",
"//base/startup/init/services/include/param",
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
public_configs = [ ":selinux_static_config" ]
public_configs = [ ":selinux_static_config" ]
public_configs += [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ]
public_configs += [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ]
...
...
services/param/base/BUILD.gn
浏览文件 @
5044f269
...
@@ -134,7 +134,7 @@ if (defined(ohos_lite)) {
...
@@ -134,7 +134,7 @@ if (defined(ohos_lite)) {
if (build_selinux) {
if (build_selinux) {
include_dirs += [
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
sources +=
sources +=
[ "//base/startup/init/services/param/adapter/param_selinux.c" ]
[ "//base/startup/init/services/param/adapter/param_selinux.c" ]
...
@@ -142,7 +142,7 @@ if (defined(ohos_lite)) {
...
@@ -142,7 +142,7 @@ if (defined(ohos_lite)) {
"PARAM_SUPPORT_SELINUX",
"PARAM_SUPPORT_SELINUX",
"PARAMWORKSPACE_NEED_MUTEX",
"PARAMWORKSPACE_NEED_MUTEX",
]
]
deps += [ "//base/security/selinux:libselinux_parameter_static" ]
deps += [ "//base/security/selinux
_adapter
:libselinux_parameter_static" ]
}
}
if (param_base_log) {
if (param_base_log) {
defines += [ "PARAM_BASE_LOG" ]
defines += [ "PARAM_BASE_LOG" ]
...
@@ -166,13 +166,13 @@ if (defined(ohos_lite)) {
...
@@ -166,13 +166,13 @@ if (defined(ohos_lite)) {
if (build_selinux) {
if (build_selinux) {
include_dirs += [
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
defines += [
defines += [
"PARAM_SUPPORT_SELINUX",
"PARAM_SUPPORT_SELINUX",
"PARAMWORKSPACE_NEED_MUTEX",
"PARAMWORKSPACE_NEED_MUTEX",
]
]
deps += [ "//base/security/selinux:libselinux_parameter_static" ]
deps += [ "//base/security/selinux
_adapter
:libselinux_parameter_static" ]
}
}
if (param_base_log) {
if (param_base_log) {
defines += [ "PARAM_BASE_LOG" ]
defines += [ "PARAM_BASE_LOG" ]
...
...
services/param/linux/BUILD.gn
浏览文件 @
5044f269
...
@@ -40,7 +40,7 @@ param_include_dirs = [
...
@@ -40,7 +40,7 @@ param_include_dirs = [
"//third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
"//third_party/cJSON",
"//third_party/cJSON",
"//commonlibrary/utils_lite/include",
"//commonlibrary/utils_lite/include",
"//base/security/selinux/interfaces/policycoreutils/include",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include",
]
]
param_service_sources = [
param_service_sources = [
...
@@ -132,7 +132,7 @@ if (defined(ohos_lite)) {
...
@@ -132,7 +132,7 @@ if (defined(ohos_lite)) {
if (build_selinux) {
if (build_selinux) {
include_dirs += [
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
defines += [
defines += [
"PARAM_SUPPORT_SELINUX",
"PARAM_SUPPORT_SELINUX",
...
...
test/unittest/BUILD.gn
浏览文件 @
5044f269
...
@@ -352,7 +352,7 @@ ohos_unittest("init_unittest") {
...
@@ -352,7 +352,7 @@ ohos_unittest("init_unittest") {
sources += [ "param/selinux_unittest.cpp" ]
sources += [ "param/selinux_unittest.cpp" ]
include_dirs += [
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux/interfaces/policycoreutils/include/",
"//base/security/selinux
_adapter
/interfaces/policycoreutils/include/",
]
]
sources += [
sources += [
"//base/startup/init/services/modules/selinux/selinux_adp.c",
"//base/startup/init/services/modules/selinux/selinux_adp.c",
...
...
ueventd/BUILD.gn
浏览文件 @
5044f269
...
@@ -91,7 +91,7 @@ if (defined(ohos_lite)) {
...
@@ -91,7 +91,7 @@ if (defined(ohos_lite)) {
defines = [ "__RAMDISK__" ]
defines = [ "__RAMDISK__" ]
cflags = []
cflags = []
if (build_selinux) {
if (build_selinux) {
external_deps = [ "selinux:librestorecon" ]
external_deps = [ "selinux
_adapter
:librestorecon" ]
cflags += [ "-DWITH_SELINUX" ]
cflags += [ "-DWITH_SELINUX" ]
}
}
...
@@ -116,7 +116,7 @@ if (defined(ohos_lite)) {
...
@@ -116,7 +116,7 @@ if (defined(ohos_lite)) {
cflags = []
cflags = []
deps += [ "//base/startup/init/services/param/base:param_base" ]
deps += [ "//base/startup/init/services/param/base:param_base" ]
if (build_selinux) {
if (build_selinux) {
external_deps = [ "selinux:librestorecon" ]
external_deps = [ "selinux
_adapter
:librestorecon" ]
cflags += [ "-DWITH_SELINUX" ]
cflags += [ "-DWITH_SELINUX" ]
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录