From 239a4320cf15311d50c73d4a9a85d6dc0164181d Mon Sep 17 00:00:00 2001 From: peng_langyuan Date: Mon, 26 Jun 2023 13:39:35 +0800 Subject: [PATCH] preset startup component to build --- 0021-preset-startup-component-to-build.patch | 133 +++++++++++++++++++ distributed-build.spec | 6 +- 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 0021-preset-startup-component-to-build.patch diff --git a/0021-preset-startup-component-to-build.patch b/0021-preset-startup-component-to-build.patch new file mode 100644 index 0000000..8eb575e --- /dev/null +++ b/0021-preset-startup-component-to-build.patch @@ -0,0 +1,133 @@ +From e79e758c20d4dee00e21c42e8151eaf27503608f Mon Sep 17 00:00:00 2001 +From: peng_langyuan +Date: Mon, 26 Jun 2023 13:31:35 +0800 +Subject: [PATCH] preset startup component to build + +--- + .../compiler_gn/base/startup/init/bundle.json | 1 + + .../init/interfaces/innerkits/BUILD.gn | 43 +++++++++++-------- + .../startup/init/interfaces/innerkits/include | 1 - + .../init/services/param_service/BUILD.gn | 22 ++++++++++ + 4 files changed, 49 insertions(+), 18 deletions(-) + mode change 100644 => 100755 openeuler/compiler_gn/base/startup/init/bundle.json + delete mode 120000 openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include + create mode 100644 openeuler/compiler_gn/base/startup/init/services/param_service/BUILD.gn + +diff --git a/openeuler/compiler_gn/base/startup/init/bundle.json b/openeuler/compiler_gn/base/startup/init/bundle.json +old mode 100644 +new mode 100755 +index 86a8022..7d22547 +--- a/openeuler/compiler_gn/base/startup/init/bundle.json ++++ b/openeuler/compiler_gn/base/startup/init/bundle.json +@@ -42,6 +42,7 @@ + ] + }, + "sub_component": [ ++ "//base/startup/init/services/param_service:param_service" + ], + "inner_kits": [ + { +diff --git a/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn b/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn +index e0098e1..abeacec 100644 +--- a/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn ++++ b/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn +@@ -12,32 +12,41 @@ + # limitations under the License. + import("//build/ohos.gni") + +-config("libbegetutil_config") { ++config("exported_header_files") { ++ visibility = [ ":*" ] + include_dirs = [ + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/syspara", + "//base/startup/init/services/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + ] +- libs = [ "begetutil.z" ] + } + +-config("libbeget_proxy_config") { +- include_dirs = [ +- "//base/startup/init/interfaces/innerkits/include", +- "//base/startup/init/interfaces/innerkits/include/syspara", +- "//base/startup/init/services/include", +- "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", +- ] +- libs = [ "beget_proxy.z" ] +-} ++# 建立所需头文件链接 ++exec_script("//build/openeuler/script/link.py", [ "--src_target", "/usr/include/beget", "--dest_target", ++ rebase_path("//base/startup/init/interfaces/innerkits/include") ], "string") + +-group("libbegetutil") { +- public_configs = [ ":libbegetutil_config" ] +-} ++exec_script("//build/openeuler/script/link.py", [ "--src_target", "/usr/include/beget", "--dest_target", ++ rebase_path("//base/startup/init/services/include") ], "string") ++ ++ohos_prebuilt_shared_library("libbegetutil") { + +-# watcher lib must separate compilation avoid interdependence. +-group("libbeget_proxy") { +- public_configs = [ ":libbeget_proxy_config" ] ++ source = "/usr/lib64/libbegetutil.z.so" ++ ++ public_configs = [ ":exported_header_files" ] ++ install_images = [ "system" ] ++ ++ part_name = "init" ++ subsystem_name = "startup" + } + ++ohos_prebuilt_shared_library("libbeget_proxy") { ++ ++ source = "/usr/lib64/libbeget_proxy.z.so" ++ ++ public_configs = [ ":exported_header_files" ] ++ install_images = [ "system" ] ++ ++ part_name = "init" ++ subsystem_name = "startup" ++} +\ No newline at end of file +diff --git a/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include b/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include +deleted file mode 120000 +index d5f3932..0000000 +--- a/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/include/init +\ No newline at end of file +diff --git a/openeuler/compiler_gn/base/startup/init/services/param_service/BUILD.gn b/openeuler/compiler_gn/base/startup/init/services/param_service/BUILD.gn +new file mode 100644 +index 0000000..911160f +--- /dev/null ++++ b/openeuler/compiler_gn/base/startup/init/services/param_service/BUILD.gn +@@ -0,0 +1,22 @@ ++# 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") ++ ++ohos_prebuilt_executable("param_service") { ++ source = "/usr/bin/param_service" ++ ++ install_enable = true ++ part_name = "init" ++ subsystem_name = "startup" ++} +\ No newline at end of file +-- +2.39.1 + diff --git a/distributed-build.spec b/distributed-build.spec index 67b3111..b95cc0f 100644 --- a/distributed-build.spec +++ b/distributed-build.spec @@ -2,7 +2,7 @@ %global openHarmony_source_release OpenHarmony-v3.2-Release Name: distributed-build Version: 1.0.0 -Release: 5 +Release: 6 Summary: openEuler embedded softbus build tools License: Apache-2.0 URL: https://gitee.com/openharmony/build @@ -28,6 +28,7 @@ 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 +Patch0021: 0021-preset-startup-component-to-build.patch BuildArch: noarch @@ -48,6 +49,9 @@ cp -rp %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist /opt/distributed-middleware-build %changelog +* Mon Jun 26 2023 peng_langyuan - 1.0.0-6 +- preset startup component to build + * Tue Jun 20 2023 hepeng - 1.0.0-5 - add some components to build. -- Gitee