packages/distributed-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change by zjq

Browse Source
This commit is contained in:
zxstty 2023-12-06 15:52:21 +08:00
parent 75d1369b62
commit 71c21c8079
22 changed files with 490 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0001-feat-Adapt-to-Openeuler-python-export-lld.patch
View File

@ -1,12 +1,7 @@
From e7e22adf4bc5b176e68a42298e478a353e664812 Mon Sep 17 00:00:00 2001
From: peng_langyuan <peng_langyuan@hoperun.com>
Date: Thu, 18 May 2023 16:10:29 +0800
Subject: [PATCH 01/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E6=9B=BF?=
=?UTF-8?q?=E6=8D=A2python=E8=B7=AF=E5=BE=84=20&&=20export=20lld=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 9d1e0dcc61af68410c3662c64553c8235385d4d1 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0001
---
build_scripts/build.sh | 25 ++++++++++++++++++++++---

12
0002-feat-Adapt-to-Openeuler-for-compilation.patch
View File

@ -1,11 +1,7 @@
From 01b899f9d73acccd7c44d1c2e049ad63a0a312d6 Mon Sep 17 00:00:00 2001
From: peng_langyuan <peng_langyuan@hoperun.com>
Date: Thu, 18 May 2023 16:11:43 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E7=BC=96?=
=?UTF-8?q?=E8=AF=91=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 15ecabfa18a391b57ee46ed94b3b0aa74e00b5af Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0002
---
config/BUILDCONFIG.gn | 45 ++++-

13
0003-feat-Adapt-to-Openeuler-add-clang.patch
View File

@ -1,12 +1,7 @@
From 8cfe4ff5d9910524223706b37dacdea1ff2e2aea Mon Sep 17 00:00:00 2001
From: peng_langyuan <peng_langyuan@hoperun.com>
Date: Thu, 18 May 2023 16:12:08 +0800
Subject: [PATCH 03/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=B9=B3=E5=8F=B0=E7=BC=96=E8=AF=91=E9=93=BE=20&&=20?=
=?UTF-8?q?=E7=BC=96=E8=AF=91=E5=B7=A5=E5=85=B7=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 6e60ac76bd9c5502b7ce23cb7c566075f1e22dce Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0003
---
toolchain/gcc_toolchain.gni | 7 ++++++-

13
0004-feat-Adapt-to-Openeuler-add-include-file.patch
View File

@ -1,12 +1,7 @@
From dd39926f233ced1acad598f0fe8baef591f839f6 Mon Sep 17 00:00:00 2001
From: peng_langyuan <peng_langyuan@hoperun.com>
Date: Thu, 18 May 2023 16:12:28 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E7=9B=AE=E5=BD=95=E7=94=A8=E4=BA=8E=E5=B9=B3=E5=8F=B0?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 855454a4fdde2256be75ad6703fddde0fa7c5e8b Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0004
---
openeuler/BUILD.gn | 13 ++++++

8
0005-feat-use-pyyaml-on-openeuler.patch
View File

@ -1,7 +1,7 @@
From 76fa62cebb91efc4e41e50b024fc226d4ae34c1d Mon Sep 17 00:00:00 2001
From: tian hang <tian_hang@hoperun.com>
Date: Thu, 18 May 2023 08:43:41 +0000
Subject: [PATCH 05/11] feat:use pyyaml on openeuler
From 42b71076304a0efb17fa7dfcc3286c727be35a73 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0005
---
ohos/hisysevent/gen_def_from_all_yaml.py | 2 +-

8
0006-feat-add-base-config.json-for-openeuler.patch
View File

@ -1,7 +1,7 @@
From d4188c449e08fe30a7859fa23378b1f25c2f69cb Mon Sep 17 00:00:00 2001
From: tian hang <tian_hang@hoperun.com>
Date: Thu, 18 May 2023 09:36:07 +0000
Subject: [PATCH 06/11] feat:add base config.json for openeuler
From aea0f5f7f298a45b287151e1d53d26cdd6db1268 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0006
---
.../vendor/openeuler/openeuler/config.json | 108 ++++++++++++++++++

266
0007-feat-add-gn-files-to-use-packages-on-openeuler.patch
View File

@ -1,240 +1,23 @@
From a2c22a0926e430d4021422fd43da59a95abeba67 Mon Sep 17 00:00:00 2001
From: tian hang <tian_hang@hoperun.com>
Date: Thu, 18 May 2023 09:36:59 +0000
Subject: [PATCH 07/11] feat: add gn files to use packages on openeuler
From b6fa9cb06682311714ce18e6a65f243c6299af2f Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0007
---
.../systemabilitymgr/samgr/bundle.json | 78 +++++++++++++++++++
.../interfaces/innerkits/common/BUILD.gn | 38 +++++++++
.../samgr/interfaces/innerkits/common/include | 1 +
.../interfaces/innerkits/samgr_proxy/BUILD.gn | 43 ++++++++++
.../interfaces/innerkits/samgr_proxy/include | 1 +
.../samgr/services/lsamgr/include | 1 +
.../bounds_checking_function/BUILD.gn | 28 +++++++
.../bounds_checking_function/BUILD.gn | 28 +++++++++++++++++++
.../bounds_checking_function/include | 1 +
.../compiler_gn/third_party/cJSON/BUILD.gn | 25 ++++++
.../compiler_gn/third_party/cJSON/BUILD.gn | 25 +++++++++++++++++
.../compiler_gn/third_party/cJSON/cJSON.h | 1 +
.../compiler_gn/third_party/libxml2/BUILD.gn | 11 +++
.../compiler_gn/third_party/libxml2/BUILD.gn | 11 ++++++++
.../third_party/libxml2/include/libxml | 1 +
.../compiler_gn/third_party/mbedtls/BUILD.gn | 19 +++++
.../compiler_gn/third_party/mbedtls/include | 1 +
14 files changed, 249 insertions(+)
create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json
create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn
create mode 120000 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include
create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn
create mode 120000 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include
create mode 120000 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include
6 files changed, 67 insertions(+)
create mode 100644 openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn
create mode 120000 openeuler/compiler_gn/third_party/bounds_checking_function/include
create mode 100644 openeuler/compiler_gn/third_party/cJSON/BUILD.gn
create mode 120000 openeuler/compiler_gn/third_party/cJSON/cJSON.h
create mode 100644 openeuler/compiler_gn/third_party/libxml2/BUILD.gn
create mode 120000 openeuler/compiler_gn/third_party/libxml2/include/libxml
create mode 100644 openeuler/compiler_gn/third_party/mbedtls/BUILD.gn
create mode 120000 openeuler/compiler_gn/third_party/mbedtls/include
diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json
new file mode 100644
index 0000000..25dc757
--- /dev/null
+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json
@@ -0,0 +1,78 @@
+{
+ "name": "@ohos/systemabilitymgr_samgr",
+ "description": "system ability manager",
+ "homePage": "https://gitee.com/openharmony",
+ "version": "3.1",
+ "license": "Apache License 2.0",
+ "repository": "https://gitee.com/openharmony/systemabilitymgr_samgr",
+ "publishAs": "code-segment",
+ "segment": {
+ "destPath": "foundation/systemabilitymgr/samgr"
+ },
+ "dirs": {},
+ "scripts": {},
+ "component": {
+ "name": "samgr",
+ "subsystem": "systemabilitymgr",
+ "features": [ "samgr_feature_coverage = false" ],
+ "adapted_system_type": [
+ "standard"
+ ],
+ "rom": "300KB",
+ "ram": "7130KB",
+ "deps": {
+ "components": [
+ "access_token",
+ "c_utils",
+ "eventhandler",
+ "hisysevent_native",
+ "hitrace_native",
+ "hiviewdfx_hilog_native",
+ "init",
+ "ipc",
+ "samgr",
+ "selinux",
+ "startup_l2"
+ ],
+ "third_party": [ "libxml2" ]
+ },
+ "build": {
+ "group_type": {
+ "base_group": [],
+ "fwk_group": [
+ "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common",
+ "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy"
+ ]
+ },
+ "inner_kits": [
+ {
+ "header": {
+ "header_base": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/",
+ "header_files": [
+ "if_system_ability_manager.h",
+ "iservice_registry.h",
+ "isystem_ability_load_callback.h",
+ "isystem_ability_status_change.h",
+ "system_ability_definition.h",
+ "system_ability_manager_proxy.h",
+ "system_ability_load_callback_stub.h",
+ "system_ability_status_change_stub.h",
+ "sam_log.h"
+ ]
+ },
+ "name": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy"
+ },
+ {
+ "header": {
+ "header_base": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include/",
+ "header_files": [
+ "sa_profiles.h",
+ "parse_util.h"
+ ]
+ },
+ "name": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common"
+ }
+ ]
+ }
+ }
+}
diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn
new file mode 100644
index 0000000..a129d8b
--- /dev/null
+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn
@@ -0,0 +1,38 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+
+config("all_config_samgr_common") {
+ include_dirs = [
+ "include",
+ ]
+ libs = ["samgr_common",]
+}
+
+config("config_samgr_common") {
+ include_dirs = [
+ "include",
+ ]
+ libs = ["samgr_common",]
+}
+
+################################################################################
+group("samgr_common") {
+
+ public_configs = [ ":config_samgr_common" ]
+
+ all_dependent_configs = [ ":all_config_samgr_common" ]
+
+}
+################################################################################
diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include
new file mode 120000
index 0000000..bc414ef
--- /dev/null
+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include
@@ -0,0 +1 @@
+/usr/include/
\ No newline at end of file
diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn
new file mode 100644
index 0000000..44b42ad
--- /dev/null
+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn
@@ -0,0 +1,43 @@
+# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("//build/ohos_var.gni")
+
+config("samgr_proxy_config") {
+ include_dirs = [
+ "include",
+ "//third_party/libxml2/include",
+ ]
+
+ libs = ["samgr_proxy",]
+}
+
+#config("samgr_proxy_private_config") {
+# include_dirs = [
+# "include",
+ #"//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr",
+ #"//foundation/systemabilitymgr/samgr/services/lsamgr/include",
+ #"//foundation/systemabilitymgr/samgr/services/samgr/native/include",
+ #"//foundation/systemabilitymgr/samgr/utils/native/include",
+# ]
+# libs = ["samgr_proxy",]
+#}
+
+group("samgr_proxy"){
+#ohos_shared_library("samgr_proxy") {
+ public_configs = [ ":samgr_proxy_config" ]
+
+ all_dependent_configs = [ ":samgr_proxy_config" ]
+
+}
diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include
new file mode 120000
index 0000000..bc414ef
--- /dev/null
+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include
@@ -0,0 +1 @@
+/usr/include/
\ No newline at end of file
diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include
new file mode 120000
index 0000000..bc414ef
--- /dev/null
+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include
@@ -0,0 +1 @@
+/usr/include/
\ No newline at end of file
diff --git a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn
new file mode 100644
index 0000000..ae44b79
@ -341,39 +124,6 @@ index 0000000..8eb8d2d
@@ -0,0 +1 @@
+/usr/include/libxml2/libxml/
\ No newline at end of file
diff --git a/openeuler/compiler_gn/third_party/mbedtls/BUILD.gn b/openeuler/compiler_gn/third_party/mbedtls/BUILD.gn
new file mode 100644
index 0000000..dd5723b
--- /dev/null
+++ b/openeuler/compiler_gn/third_party/mbedtls/BUILD.gn
@@ -0,0 +1,19 @@
+import("//build/ohos.gni")
+config("mbedtls_config") {
+ include_dirs = [
+ "include",
+ ]
+ libs = [
+ "mbedtls",
+ "mbedcrypto",
+ ]
+}
+
+ohos_shared_library("mbedtls_shared") {
+ public_configs = [ ":mbedtls_config" ]
+}
+
+group("mbedtls") {
+ public_deps = [ ":mbedtls_shared" ]
+}
+
diff --git a/openeuler/compiler_gn/third_party/mbedtls/include b/openeuler/compiler_gn/third_party/mbedtls/include
new file mode 120000
index 0000000..bc414ef
--- /dev/null
+++ b/openeuler/compiler_gn/third_party/mbedtls/include
@@ -0,0 +1 @@
+/usr/include/
\ No newline at end of file
--
2.33.0

8
0008-feat-Adapt-to-openeuler.patch
View File

@ -1,7 +1,7 @@
From ab7d96e80f3828a05b8fd8ea923d38b3d67500f4 Mon Sep 17 00:00:00 2001
From: peng_langyuan <peng_langyuan@hoperun.com>
Date: Fri, 19 May 2023 17:17:15 +0800
Subject: [PATCH 08/11] feat : Adapt to openeuler
From 36899a1bd498e730983259e8330a006eb09ff702 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0008
---
build_scripts/build.sh | 27 +--

8
0009-feat-add-common-subsystem-and-delete-useless-config.patch
View File

@ -1,7 +1,7 @@
From 43f6c457bbbdd2cc158f49e6653ffa028661daf2 Mon Sep 17 00:00:00 2001
From: tian hang <tian_hang@hoperun.com>
Date: Fri, 19 May 2023 09:29:22 +0000
Subject: [PATCH 09/11] feat:add common subsystem and delete useless config
From 617f6a50de2e620d087aeacae0c1b228796cb9ba Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:52 +0800
Subject: [PATCH] 0009
---
openeuler/vendor/openeuler/openeuler/config.json | 9 ++++++++-

8
0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch
View File

@ -1,7 +1,7 @@
From c42d7cc5c56f11131dd6debee3b383b49d2d4344 Mon Sep 17 00:00:00 2001
From: tian2020 <tian_hang@hoperun.com>
Date: Tue, 30 May 2023 16:50:10 +0800
Subject: [PATCH] fix rpm build fail caused by wrong useless code
From 1cbc7b95aae9da56ed4fa257d7132ac03c378601 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:53 +0800
Subject: [PATCH] 0012
---
config/mac/xcrun.py | 2 +-

8
0013-feature-use-llvm-tools-version-15-for-build.patch
View File

@ -1,7 +1,7 @@
From f368525248e0bd5f4b101bfa7b4bff98a0eb45af Mon Sep 17 00:00:00 2001
From: tian2020 <tian_hang@hoperun.com>
Date: Tue, 13 Jun 2023 16:33:47 +0800
Subject: [PATCH] feature:use llvm tools version 15 for build
From cf30b6c5ecd1dc864bf25c3eea3c3b420797d6f3 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:53 +0800
Subject: [PATCH] 0013
---
build_scripts/build.sh | 3 +--

8
0014-feat-delete-the-default-sqlite-deps.patch
View File

@ -1,7 +1,7 @@
From 2e2faeec378bf28912d3339afc24f1955f81fe02 Mon Sep 17 00:00:00 2001
From: tian2020 <tian_hang@hoperun.com>
Date: Thu, 15 Jun 2023 11:12:35 +0800
Subject: [PATCH 1/2] feat delete the default sqlite deps
From 62f7f666dba56a23d31d53a480f5957dc6e1f05d Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:53 +0800
Subject: [PATCH] 0014
---
common/BUILD.gn | 3 ++-

8
0015-feat-and-hilog-gn-files.patch
View File

@ -1,7 +1,7 @@
From 1e4e43b6c5fc612c314e99914251235a37d839cb Mon Sep 17 00:00:00 2001
From: tian2020 <tian_hang@hoperun.com>
Date: Thu, 15 Jun 2023 14:15:23 +0800
Subject: [PATCH 2/2] feat:and hilog gn files
From 9c2b1b9b9d9170775358732a04ff65bb65ed6c55 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:53 +0800
Subject: [PATCH] 0015
---
.../base/hiviewdfx/hilog/bundle.json | 37 ++++++++++

8
0016-fix-use-llvm15-path-on-x86_64.patch
View File

@ -1,7 +1,7 @@
From 0b07bcf8a6550a98c5b87b9da2bc9ac41af1bf4e Mon Sep 17 00:00:00 2001
From: tian2020 <tian_hang@hoperun.com>
Date: Thu, 15 Jun 2023 17:16:03 +0800
Subject: [PATCH] fix: use llvm15 path on x86_64
From bc15bf76bd51a0c017b8f1a289e84831ac7a6388 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:53 +0800
Subject: [PATCH] 0016
---
toolchain/linux/BUILD.gn | 1 -

8
0017-feat-add-script-to-create-soft-link.patch
View File

@ -1,7 +1,7 @@
From 2e6f009669ad3f5a7c5ab3d0f50ff612881820d5 Mon Sep 17 00:00:00 2001
From: peng_langyuan <peng_langyuan@hoperun.com>
Date: Fri, 16 Jun 2023 10:10:39 +0800
Subject: [PATCH 2/3] feat:add script to create soft link
From 0d541aba54454543bcfc9f9047f87d1570413b1b Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Thu, 9 Nov 2023 11:10:53 +0800
Subject: [PATCH] 0017
---
openeuler/script/link.py | 46 ++++++++++++++++++++++++++++++++++++++++

8
0018-feat-add-safwk-compile-gn-target.patch
View File

@ -1,7 +1,7 @@
From 7aa47681e17926be40f9ef7074377816fdc76efe Mon Sep 17 00:00:00 2001
From: peng_langyuan <peng_langyuan@hoperun.com>
Date: Fri, 16 Jun 2023 10:09:08 +0800
Subject: [PATCH 1/3] feat:add safwk compile gn target
From 9bef986150282fb772966baaf947f7a7cbd82301 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Wed, 8 Nov 2023 18:22:52 +0800
Subject: [PATCH] 0018
---
.../systemabilitymgr/safwk/bundle.json | 58 +++++++++++++++++++

8
0019-feat-add-devicemanager-gn-files.patch
View File

@ -1,7 +1,7 @@
From 7c774820edb327a81e0be9f7891d45bf4eee9ac7 Mon Sep 17 00:00:00 2001
From: tian2020 <tian_hang@hoperun.com>
Date: Fri, 16 Jun 2023 15:17:37 +0800
Subject: [PATCH 3/3] feat:add devicemanager gn files
From c3dff0469668eb1589203ca1275aac86268f21ad Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Wed, 8 Nov 2023 18:22:52 +0800
Subject: [PATCH] 0019
---
.../device_manager/BUILD.gn | 17 ++++

68
0020-feat-add-openssl-gn-file-and-soft-link.patch Normal file
View File

@ -0,0 +1,68 @@
From 536f71e3670ad6c821b980f6336c614dcf693d3e Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Wed, 8 Nov 2023 18:36:59 +0800
Subject: [PATCH] add openssl
---
.../compiler_gn/third_party/openssl/BUILD.gn | 39 +++++++++++++++++++
.../third_party/openssl/include/openssl | 1 +
2 files changed, 40 insertions(+)
create mode 100644 openeuler/compiler_gn/third_party/openssl/BUILD.gn
create mode 120000 openeuler/compiler_gn/third_party/openssl/include/openssl
diff --git a/openeuler/compiler_gn/third_party/openssl/BUILD.gn b/openeuler/compiler_gn/third_party/openssl/BUILD.gn
new file mode 100644
index 0000000..7b953eb
--- /dev/null
+++ b/openeuler/compiler_gn/third_party/openssl/BUILD.gn
@@ -0,0 +1,39 @@
+# Copyright (c) 2020-2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+
+# Only use this to set/unset some cflags, use "platform" variable in gn template to add
+# source code for Windows.
+
+config("libcrypto_config") {
+ include_dirs = [ "/usr/include/openssl" ]
+ libs = [ "crypto" ]
+}
+
+group("libcrypto_static") {
+ public_configs = [ ":libcrypto_config" ]
+}
+
+group("libcrypto_shared") {
+ public_configs = [ ":libcrypto_config" ]
+}
+
+config("libssl_config") {
+ include_dirs = [ "/usr/include/openssl" ]
+ libs = [ "ssl" ]
+}
+
+group("libssl_shared") {
+ public_configs = [ ":libssl_config" ]
+}
diff --git a/openeuler/compiler_gn/third_party/openssl/include/openssl b/openeuler/compiler_gn/third_party/openssl/include/openssl
new file mode 120000
index 0000000..6c29d44
--- /dev/null
+++ b/openeuler/compiler_gn/third_party/openssl/include/openssl
@@ -0,0 +1 @@
+/usr/include/openssl
\ No newline at end of file
--
2.33.0

268
0021-feat-change-config-json.patch Normal file
View File

@ -0,0 +1,268 @@
From fa9833b5a52e5a69945d7241652e1f0273dc8039 Mon Sep 17 00:00:00 2001
From: zxstty <zhaojiaqi18@huawei.com>
Date: Tue, 14 Nov 2023 10:50:17 +0800
Subject: [PATCH] 1
---
.../vendor/openeuler/openeuler/config.json | 232 ++++++++++--------
1 file changed, 135 insertions(+), 97 deletions(-)
diff --git a/openeuler/vendor/openeuler/openeuler/config.json b/openeuler/vendor/openeuler/openeuler/config.json
index 2dfbb49..1896a16 100644
--- a/openeuler/vendor/openeuler/openeuler/config.json
+++ b/openeuler/vendor/openeuler/openeuler/config.json
@@ -1,115 +1,153 @@
{
- "product_name": "openeuler",
- "device_company": "openeuler",
- "target_os": "linux",
- "type": "standard",
- "version": "3.0",
- "board": "openeuler",
- "api_version": 8,
- "enable_ramdisk": false,
- "build_selinux": false,
- "build_seccomp": false,
- "support_jsapi": false,
- "inherit": [],
- "subsystems": [
- {
- "subsystem": "common",
- "components": [
- {
- "component": "common"
- }
- ]
+ "product_name": "openeuler",
+ "device_company": "openeuler",
+ "target_os": "linux",
+ "type": "standard",
+ "version": "3.0",
+ "board": "openeuler",
+ "api_version": 8,
+ "enable_ramdisk": false,
+ "build_selinux": false,
+ "build_seccomp": false,
+ "support_jsapi": false,
+ "inherit": [],
+ "subsystems": [
+ {
+ "subsystem": "common",
+ "components": [
+ {
+ "component": "common"
+ }
+ ]
+ },
+ {
+ "subsystem": "commonlibrary",
+ "components": [
+ {
+ "component": "c_utils",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "hiviewdfx",
+ "components": [
+ {
+ "component": "hilog_native",
+ "features": []
},
{
- "subsystem": "commonlibrary",
- "components": [
- {
- "component": "c_utils",
- "features": []
- }
- ]
+ "component": "hiviewdfx_hilog_native",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "notification",
+ "components": [
+ {
+ "component": "eventhandler",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "startup",
+ "components": [
+ {
+ "component": "init",
+ "features": [
+ "enable_ohos_startup_init_feature_ab_partition = false",
+ "enable_ohos_startup_init_feature_loader = false"
+ ]
+ }
+ ]
+ },
+ {
+ "subsystem": "security",
+ "components": [
+ {
+ "component": "huks",
+ "features": []
},
{
- "subsystem": "hiviewdfx",
- "components": [
- {
- "component": "hilog_native",
- "features": []
- },
- {
- "component": "hiviewdfx_hilog_native",
- "features": []
- }
- ]
+ "component": "device_auth",
+ "features": []
},
{
- "subsystem": "notification",
- "components": [
- {
- "component": "eventhandler",
- "features": []
- }
- ]
+ "component": "dataclassification",
+ "features": []
},
{
- "subsystem": "startup",
- "components": [
- {
- "component": "init",
- "features": [
- "enable_ohos_startup_init_feature_ab_partition = false",
- "enable_ohos_startup_init_feature_loader = false"
- ]
- }
- ]
+ "component": "device_security_level",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "communication",
+ "components": [
+ {
+ "component": "ipc",
+ "features": []
},
{
- "subsystem": "security",
- "components": [
- {
- "component": "huks",
- "features": []
- },
- {
- "component": "device_auth",
- "features": []
- }
- ]
+ "component": "dsoftbus",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "systemabilitymgr",
+ "components": [
+ {
+ "component": "safwk",
+ "features": []
},
{
- "subsystem": "communication",
- "components": [
- {
- "component": "ipc",
- "features": []
- },
- {
- "component": "dsoftbus",
- "features": []
- }
- ]
+ "component": "samgr",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "distributedhardware",
+ "components": [
+ {
+ "component": "device_manager",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "distributeddatamgr",
+ "components": [
+ {
+ "component": "kv_store",
+ "features": []
+ },
+ {
+ "component": "relational_store",
+ "features": []
},
{
- "subsystem": "systemabilitymgr",
- "components": [
- {
- "component": "safwk",
- "features": []
- },
- {
- "component": "samgr",
- "features": []
- }
- ]
+ "component": "datamgr_service",
+ "features": []
},
{
- "subsystem": "distributedhardware",
- "components": [
- {
- "component": "device_manager",
- "features": []
- }
- ]
+ "component": "data_object",
+ "features": []
+ }
+ ]
+ },
+ {
+ "subsystem": "filemanagement",
+ "components": [
+ {
+ "component": "dfs_service",
+ "features": []
}
- ]
-}
+ ]
+ }
+ ]
+}
\ No newline at end of file
--
2.33.0

75
0022-add-build-gn-file-of-icu-jsoncpp-zlib.patch Normal file
View File

@ -0,0 +1,75 @@
From 05a1c372db8ad7303c67254b975a614bdaa37e0d Mon Sep 17 00:00:00 2001
From: heppen <hepeng68@huawei.com>
Date: Fri, 17 Nov 2023 16:08:48 +0800
Subject: [PATCH] add build gn file of icu/jsoncpp/zlib
---
.../third_party/icu/icu4c/BUILD.gn | 19 +++++++++++++++++++
.../compiler_gn/third_party/jsoncpp/BUILD.gn | 11 +++++++++++
.../compiler_gn/third_party/zlib/BUILD.gn | 10 ++++++++++
3 files changed, 40 insertions(+)
create mode 100644 openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn
create mode 100644 openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn
create mode 100644 openeuler/compiler_gn/third_party/zlib/BUILD.gn
diff --git a/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn
new file mode 100644
index 0000000..ac57abf
--- /dev/null
+++ b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn
@@ -0,0 +1,19 @@
+import("//build/ohos.gni")
+
+config("icuuc_config"){
+ include_dirs = [ "/usr/include/unicode" ]
+ libs = [ "icuuc" ]
+}
+
+group("shared_icuuc") {
+ public_configs = [ ":icuuc_config" ]
+}
+
+config("icui18n_config"){
+ include_dirs = [ "/usr/include/unicode" ]
+ libs = [ "icui18n" ]
+}
+
+ohos_shared_library("shared_icui18n") {
+ public_configs = [ ":icui18n_config" ]
+}
diff --git a/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn
new file mode 100644
index 0000000..2264d70
--- /dev/null
+++ b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn
@@ -0,0 +1,11 @@
+import("//build/ohos.gni")
+
+
+config("jsoncpp_config") {
+ include_dirs = [ "/usr/include/json" ]
+ libs = ["jsoncpp"]
+}
+
+group("jsoncpp") {
+ public_configs = [":jsoncpp_config"]
+}
diff --git a/openeuler/compiler_gn/third_party/zlib/BUILD.gn b/openeuler/compiler_gn/third_party/zlib/BUILD.gn
new file mode 100644
index 0000000..1837ef8
--- /dev/null
+++ b/openeuler/compiler_gn/third_party/zlib/BUILD.gn
@@ -0,0 +1,10 @@
+import("//build/ohos.gni")
+
+config("zlib_config") {
+ include_dirs = [ "/usr/include" ]
+ libs = [ "z" ]
+}
+
+group("shared_libz") {
+ public_configs = [":zlib_config" ]
+}
--
2.33.0

13
distributed-build.spec
View File

@ -17,18 +17,19 @@ Patch0006: 0006-feat-add-base-config.json-for-openeuler.patch
Patch0007: 0007-feat-add-gn-files-to-use-packages-on-openeuler.patch
Patch0008: 0008-feat-Adapt-to-openeuler.patch
Patch0009: 0009-feat-add-common-subsystem-and-delete-useless-config.patch
Patch0010: 0010-feat-use-include-samgr-for-samgr-include-files-confi.patch
Patch0011: 0011-feat-use-.z-for-libs-name.patch
#Patch0010: 0010-feat-use-include-samgr-for-samgr-include-files-confi.patch
#Patch0011: 0011-feat-use-.z-for-libs-name.patch
Patch0012: 0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch
Patch0013: 0013-feature-use-llvm-tools-version-15-for-build.patch
Patch0014: 0014-feat-delete-the-default-sqlite-deps.patch
Patch0015: 0015-feat-and-hilog-gn-files.patch
Patch0016: 0016-fix-use-llvm15-path-on-x86_64.patch
Patch0017: 0017-feat-add-script-to-create-soft-link.patch
Patch0018: 0018-feat-add-safwk-compile-gn-target.patch
Patch0019: 0019-feat-add-devicemanager-gn-files.patch
Patch0020: 0020-add-some-components-to-build.patch
#Patch0018: 0018-feat-add-safwk-compile-gn-target.patch
#Patch0019: 0019-feat-add-devicemanager-gn-files.patch
Patch0020: 0020-feat-add-openssl-gn-file-and-soft-link.patch
Patch0021: 0021-feat-change-config-json.patch
Patch0022: 0022-add-build-gn-file-of-icu-jsoncpp-zlib.patch
BuildArch: noarch
%description

BIN
third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz Normal file
View File

Binary file not shown.