!6 同步到 sp2 next分支
From: @muyuying1 Reviewed-by: @heppen Signed-off-by: @heppen
This commit is contained in:
commit
c8790d1753
1880
0001-remove-useless-dependency.patch
Normal file
1880
0001-remove-useless-dependency.patch
Normal file
File diff suppressed because it is too large
Load Diff
2517
0002-add-huks-component.patch
Normal file
2517
0002-add-huks-component.patch
Normal file
File diff suppressed because it is too large
Load Diff
31
0003-establish-kvstore-dependence-on-boundscheck.patch
Normal file
31
0003-establish-kvstore-dependence-on-boundscheck.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 33ac1277b3be087f696451866a586e42d6495e91 Mon Sep 17 00:00:00 2001
|
||||
From: wang--ge <wang__ge@126.com>
|
||||
Date: Fri, 21 Jul 2023 16:47:28 +0800
|
||||
Subject: [PATCH] establish kvstore dependence on boundscheck
|
||||
|
||||
---
|
||||
services/distributeddataservice/service/BUILD.gn | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn
|
||||
index 35d02e2..3fb8263 100644
|
||||
--- a/services/distributeddataservice/service/BUILD.gn
|
||||
+++ b/services/distributeddataservice/service/BUILD.gn
|
||||
@@ -112,6 +112,7 @@ ohos_shared_library("distributeddatasvc") {
|
||||
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/framework:distributeddatasvcfwk",
|
||||
"//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb:distributeddb",
|
||||
"//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata:distributeddata_inner",
|
||||
+ "//third_party/bounds_checking_function:libsec_shared",
|
||||
]
|
||||
|
||||
external_deps = [
|
||||
@@ -132,4 +133,4 @@ ohos_shared_library("distributeddatasvc") {
|
||||
subsystem_name = "distributeddatamgr"
|
||||
|
||||
part_name = "datamgr_service"
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
85
distributeddatamgr_datamgr_service.spec
Normal file
85
distributeddatamgr_datamgr_service.spec
Normal file
@ -0,0 +1,85 @@
|
||||
%define debug_package %{nil}
|
||||
%global oh_version OpenHarmony-v3.2-Release
|
||||
%global datamgr_service_dir %{_builddir}/foundation/distributeddatamgr/
|
||||
%global build_opt /opt/distributed-middleware-build
|
||||
|
||||
Name: distributeddatamgr_datamgr_service
|
||||
Version: 1.0.0
|
||||
Release: 2
|
||||
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
|
||||
|
||||
BuildRequires: libatomic libicu-devel libxml2-devel openssl-devel
|
||||
BuildRequires: distributed-build distributed-build_lite hilog distributed-utils
|
||||
BuildRequires: distributeddatamgr_relational_store distributeddatamgr_kv_store
|
||||
|
||||
Requires: hilog distributed-utils distributeddatamgr_kv_store distributeddatamgr_relational_store
|
||||
|
||||
%description
|
||||
Distributed Data Service (DDS) provides the ability to distribute database data between different devices.
|
||||
By combining account, application, and database triplets, distributed data services isolate data.
|
||||
Among trusted authentication devices, the distributed data service supports mutual data synchronization,
|
||||
providing users with a consistent data access experience on various terminal devices.
|
||||
|
||||
%prep
|
||||
rm -rf %{_builddir}/*
|
||||
|
||||
cd %{_builddir}
|
||||
cp -rp %{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}/
|
||||
|
||||
%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
|
||||
|
||||
%build
|
||||
cd %{_builddir}
|
||||
rm -rf %{_builddir}/out
|
||||
%ifarch x86_64
|
||||
./build.sh --product-name openeuler --target-cpu x86_64
|
||||
%endif
|
||||
|
||||
%ifarch aarch64
|
||||
./build.sh --product-name openeuler --target-cpu arm64
|
||||
%endif
|
||||
|
||||
%install
|
||||
install -d -m 0755 %{buildroot}%{_includedir}/%{name}
|
||||
install -d -m 0755 %{buildroot}%{_libdir}
|
||||
install -d -m 0755 %{buildroot}/system/profile
|
||||
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"
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
module_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/
|
||||
|
||||
%files
|
||||
%{_libdir}/*.so
|
||||
/system/*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 03 2023 Peng He <hepeng68@huawei.com> - 1.0.0-2
|
||||
- Add requires and rectify the contents of the RPM package.
|
||||
|
||||
* Fri Jul 21 2023 Ge Wang <wang__ge@126.com> - 1.0.0-1
|
||||
- init package
|
||||
Loading…
x
Reference in New Issue
Block a user