!19 【代码同步】将master分支内容同步至24.03-LTS-SP1分支
From: @yukaii Reviewed-by: @heppen Signed-off-by: @heppen
This commit is contained in:
openeuler-ci-bot
Gitee
commit
c773027bc5
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,96 @@
|
||||
From 7b0f91e31687521d1b5b22b2167e2245edebfc25 Mon Sep 17 00:00:00 2001
|
||||
From: s_c_c <shichuchao@huawei.com>
|
||||
Date: Sat, 29 Jun 2024 11:36:17 +0800
|
||||
Subject: [PATCH] feat for embedded permissive and include_dirs errors
|
||||
|
||||
---
|
||||
services/distributeddataservice/adapter/communicator/BUILD.gn | 2 +-
|
||||
services/distributeddataservice/adapter/dfx/BUILD.gn | 2 +-
|
||||
services/distributeddataservice/app/BUILD.gn | 4 +++-
|
||||
services/distributeddataservice/service/BUILD.gn | 4 +++-
|
||||
4 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/services/distributeddataservice/adapter/communicator/BUILD.gn b/services/distributeddataservice/adapter/communicator/BUILD.gn
|
||||
index 3b9cc42..936157b 100644
|
||||
--- a/services/distributeddataservice/adapter/communicator/BUILD.gn
|
||||
+++ b/services/distributeddataservice/adapter/communicator/BUILD.gn
|
||||
@@ -47,7 +47,7 @@ ohos_static_library("distributeddata_communicator_static") {
|
||||
"//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/interfaces/include/relational",
|
||||
]
|
||||
|
||||
- cflags_cc = [ "-fvisibility=hidden",
|
||||
+ cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w",
|
||||
"-Wno-sign-compare",]
|
||||
|
||||
deps = [
|
||||
diff --git a/services/distributeddataservice/adapter/dfx/BUILD.gn b/services/distributeddataservice/adapter/dfx/BUILD.gn
|
||||
index a471f5f..4740781 100644
|
||||
--- a/services/distributeddataservice/adapter/dfx/BUILD.gn
|
||||
+++ b/services/distributeddataservice/adapter/dfx/BUILD.gn
|
||||
@@ -39,7 +39,7 @@ ohos_static_library("distributeddata_dfx_static") {
|
||||
"//third_party/openssl/include/",
|
||||
]
|
||||
|
||||
- cflags_cc = [ "-fvisibility=hidden" ]
|
||||
+ cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w" ]
|
||||
|
||||
deps = [
|
||||
"../autils:distributeddata_autils_static",
|
||||
diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn
|
||||
index 1e97cb7..633a96b 100644
|
||||
--- a/services/distributeddataservice/app/BUILD.gn
|
||||
+++ b/services/distributeddataservice/app/BUILD.gn
|
||||
@@ -12,6 +12,7 @@
|
||||
# limitations under the License.
|
||||
import("//build/ohos.gni")
|
||||
import("//build/ohos_var.gni")
|
||||
+import("//build/config/sysroot.gni")
|
||||
import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni")
|
||||
|
||||
group("build_module") {
|
||||
@@ -73,11 +74,12 @@ config("module_private_config") {
|
||||
"src/security",
|
||||
"src/backup_rule/include",
|
||||
"//third_party/json/single_include",
|
||||
+ "${sysroot}/usr/include/device_manager/",
|
||||
]
|
||||
|
||||
cflags = [ "-Wno-multichar" ]
|
||||
|
||||
- cflags_cc = [ "-fvisibility=hidden" ]
|
||||
+ cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w" ]
|
||||
}
|
||||
|
||||
ohos_shared_library("distributeddataservice") {
|
||||
diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn
|
||||
index 3fb8263..f7879e0 100644
|
||||
--- a/services/distributeddataservice/service/BUILD.gn
|
||||
+++ b/services/distributeddataservice/service/BUILD.gn
|
||||
@@ -12,6 +12,7 @@
|
||||
# limitations under the License.
|
||||
import("//build/ohos.gni")
|
||||
import("//build/ohos_var.gni")
|
||||
+import("//build/config/sysroot.gni")
|
||||
|
||||
group("build_module") {
|
||||
deps = [ ":distributeddatasvc" ]
|
||||
@@ -47,6 +48,7 @@ config("module_public_config") {
|
||||
"//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/interfaces/include/relational",
|
||||
"//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
|
||||
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
|
||||
+ "${sysroot}/usr/include/device_manager/",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -101,7 +103,7 @@ ohos_shared_library("distributeddatasvc") {
|
||||
]
|
||||
cflags = [ "-Wno-multichar" ]
|
||||
|
||||
- cflags_cc = [ "-fvisibility=hidden", "-Wno-format" ]
|
||||
+ cflags_cc = [ "-fvisibility=hidden", "-Wno-format", "-fpermissive", "-w" ]
|
||||
|
||||
configs = [ ":module_public_config" ]
|
||||
|
||||
--
|
||||
2.45.2.windows.1
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 56cbddb6351234705a581d66674f2f50650ae419 Mon Sep 17 00:00:00 2001
|
||||
From: s_c_c <shichuchao@huawei.com>
|
||||
Date: Mon, 2 Sep 2024 17:41:36 +0800
|
||||
Subject: [PATCH] fix distributeddata_adapter_public_config visibility
|
||||
|
||||
---
|
||||
services/distributeddataservice/adapter/BUILD.gn | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/services/distributeddataservice/adapter/BUILD.gn b/services/distributeddataservice/adapter/BUILD.gn
|
||||
index 1a77c98..baec889 100644
|
||||
--- a/services/distributeddataservice/adapter/BUILD.gn
|
||||
+++ b/services/distributeddataservice/adapter/BUILD.gn
|
||||
@@ -23,7 +23,7 @@ config("distributeddata_adapter_private_config") {
|
||||
}
|
||||
|
||||
config("distributeddata_adapter_public_config") {
|
||||
- visibility = [ "//foundation/distributeddatamgr/datamgr_service:*" ]
|
||||
+ visibility = [ ":*" ]
|
||||
|
||||
include_dirs = [
|
||||
"include/log",
|
||||
--
|
||||
2.45.2.windows.1
|
||||
|
||||
@ -1,24 +1,35 @@
|
||||
%define debug_package %{nil}
|
||||
%global oh_version OpenHarmony-v3.2-Release
|
||||
%global datamgr_service_dir %{_builddir}/foundation/distributeddatamgr/
|
||||
%global distributeddata_dir %{_builddir}/foundation/distributeddatamgr/
|
||||
%global build_opt /opt/distributed-middleware-build
|
||||
|
||||
Name: distributeddatamgr_datamgr_service
|
||||
Version: 1.0.0
|
||||
Release: 2
|
||||
Release: 5
|
||||
Summary: Distributed data manager that provides the capability to store data in the databases of different devices
|
||||
License: Apache-2.0
|
||||
Url: https://gitee.com/openharmony/distributeddatamgr_datamgr_service
|
||||
Source0: https://gitee.com/openharmony/distributeddatamgr_datamgr_service/repository/archive/OpenHarmony-v3.2-Release.tar.gz#/distributeddatamgr_datamgr_service-OpenHarmony-v3.2-Release.tar.gz
|
||||
Patch0: 0001-remove-useless-dependency.patch
|
||||
Patch1: 0002-add-huks-component.patch
|
||||
Patch2: 0003-establish-kvstore-dependence-on-boundscheck.patch
|
||||
Source1: https://gitee.com/openharmony/distributeddatamgr_datamgr_service/repository/archive/%{oh_version}.tar.gz#/distributeddatamgr_datamgr_service-%{oh_version}.tar.gz
|
||||
Patch1: 0001-remove-useless-dependency.patch
|
||||
Patch2: 0002-establish-kvstore-dependence-on-boundscheck.patch
|
||||
Patch3: 0003-feat-for-embedded-permissive-and-include_dirs-errors.patch
|
||||
Patch4: 0004-fix-distributeddata_adapter_public_config-visibility.patch
|
||||
|
||||
BuildRequires: libatomic libicu-devel libxml2-devel openssl-devel
|
||||
BuildRequires: distributed-build distributed-build_lite hilog distributed-utils
|
||||
BuildRequires: distributeddatamgr_relational_store distributeddatamgr_kv_store
|
||||
BuildRequires: libboundscheck, zlib, zlib-devel, jsoncpp, jsoncpp-devel, compat-openssl11-devel
|
||||
BuildRequires: distributed-build, distributed-beget, hilog, commonlibrary_c_utils
|
||||
BuildRequires: communication_ipc, communication_dsoftbus
|
||||
BuildRequires: systemabilitymgr_safwk, systemabilitymgr_samgr
|
||||
BuildRequires: security_dataclassification, security_device_auth, security_huks
|
||||
BuildRequires: distributedhardware_device_manager
|
||||
BuildRequires: distributeddatamgr_kv_store, distributeddatamgr_relational_store
|
||||
|
||||
Requires: hilog distributed-utils distributeddatamgr_kv_store distributeddatamgr_relational_store
|
||||
Requires: libboundscheck, zlib, zlib-devel, jsoncpp, jsoncpp-devel, compat-openssl11-devel
|
||||
Requires: distributed-beget, hilog, commonlibrary_c_utils
|
||||
Requires: communication_ipc, communication_dsoftbus
|
||||
Requires: systemabilitymgr_safwk, systemabilitymgr_samgr
|
||||
Requires: security_dataclassification, security_device_auth, security_huks
|
||||
Requires: distributedhardware_device_manager
|
||||
Requires: distributeddatamgr_kv_store, distributeddatamgr_relational_store
|
||||
|
||||
%description
|
||||
Distributed Data Service (DDS) provides the ability to distribute database data between different devices.
|
||||
@ -28,30 +39,31 @@ providing users with a consistent data access experience on various terminal dev
|
||||
|
||||
%prep
|
||||
rm -rf %{_builddir}/*
|
||||
|
||||
cd %{_builddir}
|
||||
cp -rp %{build_opt} %{_builddir}/build
|
||||
cp -rf %{build_opt} %{_builddir}/build
|
||||
[ ! -L "%{_builddir}/build.sh" ] && ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh
|
||||
[ ! -L "%{_builddir}/.gn" ] && ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn
|
||||
[ ! -L "%{_builddir}/build.py" ] && ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py
|
||||
mv build/openeuler/vendor %{_builddir}/
|
||||
cp -rf %{_builddir}/build/openeuler/vendor %{_builddir}/
|
||||
cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}
|
||||
|
||||
%setup -q -T -a 0 -c -n %{datamgr_service_dir}
|
||||
mv %{datamgr_service_dir}%{name}-%{oh_version} %{datamgr_service_dir}datamgr_service
|
||||
cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}/
|
||||
%patch0 -p1 -d %{datamgr_service_dir}datamgr_service
|
||||
%patch1 -p1 -d %{_builddir}/base/security
|
||||
%patch2 -p1 -d %{datamgr_service_dir}datamgr_service
|
||||
%setup -q -D -T -a 1 -c -n %{distributeddata_dir}
|
||||
if [ -d "%{distributeddata_dir}/datamgr_service" ]; then
|
||||
rm -rf %{distributeddata_dir}/datamgr_service
|
||||
fi
|
||||
mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/datamgr_service
|
||||
|
||||
%patch -P1 -p1 -d %{distributeddata_dir}/datamgr_service
|
||||
%patch -P2 -p1 -d %{distributeddata_dir}/datamgr_service
|
||||
%patch -P3 -p1 -d %{distributeddata_dir}/datamgr_service
|
||||
%patch -P4 -p1 -d %{distributeddata_dir}/datamgr_service
|
||||
|
||||
%build
|
||||
cd %{_builddir}
|
||||
rm -rf %{_builddir}/out
|
||||
%ifarch x86_64
|
||||
./build.sh --product-name openeuler --target-cpu x86_64
|
||||
%{_builddir}/build.sh --product-name openeuler --target-cpu x86_64
|
||||
%endif
|
||||
|
||||
%ifarch aarch64
|
||||
./build.sh --product-name openeuler --target-cpu arm64
|
||||
%{_builddir}/build.sh --product-name openeuler --target-cpu arm64
|
||||
%endif
|
||||
|
||||
%install
|
||||
@ -62,22 +74,36 @@ install -d -m 0755 %{buildroot}/system/lib64
|
||||
install -d -m 0755 %{buildroot}/system/etc/distributeddata/conf
|
||||
|
||||
%ifarch aarch64
|
||||
module_out_path="out/openeuler/linux_clang_arm64/distributeddatamgr/datamgr_service"
|
||||
%define lib_out_path out/openeuler/linux_clang_arm64/distributeddatamgr/datamgr_service
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
module_out_path="out/openeuler/linux_clang_x86_64/distributeddatamgr/datamgr_service"
|
||||
%define lib_out_path out/openeuler/linux_clang_x86_64/distributeddatamgr/datamgr_service
|
||||
%endif
|
||||
|
||||
install -m 0755 %{_builddir}/${module_out_path}/*.so %{buildroot}%{_libdir}
|
||||
install -m 0755 %{_builddir}/${module_out_path}/*.so %{buildroot}/system/lib64
|
||||
install -m 0755 %{_builddir}/out/openeuler/packages/phone/system/profile/distributeddata.xml %{buildroot}/system/profile
|
||||
install -m 0755 %{_builddir}/out/openeuler/packages/phone/system/etc/distributeddata/conf/* %{buildroot}/system/etc/distributeddata/conf/
|
||||
install -m 0755 %{_builddir}/%{lib_out_path}/*.so %{buildroot}%{_libdir}
|
||||
install -m 0755 %{_builddir}/%{lib_out_path}/*.so %{buildroot}/system/lib64
|
||||
|
||||
%define config_path out/openeuler/packages/phone/system
|
||||
install -m 0755 %{_builddir}/%{config_path}/profile/distributeddata.xml %{buildroot}/system/profile
|
||||
install -m 0755 %{_builddir}/%{config_path}/etc/distributeddata/conf/* %{buildroot}/system/etc/distributeddata/conf/
|
||||
|
||||
%files
|
||||
%{_libdir}/*.so
|
||||
/system/*
|
||||
|
||||
%changelog
|
||||
* Mon Sep 2 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-5
|
||||
- Fix distributeddata_adapter_public_config visibility for gn.
|
||||
|
||||
* Sat Jun 29 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-4
|
||||
- Fix permissive and include_dirs errors for embedded.
|
||||
|
||||
* Sat Jun 29 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-4
|
||||
- Fix permissive and include_dirs errors for embedded.
|
||||
|
||||
* Tue Nov 21 2023 Peng He <hepeng68@huawei.com> - 1.0.0-3
|
||||
- Update build requires and requires.
|
||||
|
||||
* Thu Aug 03 2023 Peng He <hepeng68@huawei.com> - 1.0.0-2
|
||||
- Add requires and rectify the contents of the RPM package.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user