From 5d4cec08c0c8cca46028f295ccbe16c2654c9cd4 Mon Sep 17 00:00:00 2001 From: heppen Date: Thu, 23 Nov 2023 14:54:03 +0800 Subject: [PATCH 1/2] unify spec format --- dfs_service.spec | 83 ++++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/dfs_service.spec b/dfs_service.spec index 5def462..6daea30 100644 --- a/dfs_service.spec +++ b/dfs_service.spec @@ -1,67 +1,82 @@ %define debug_package %{nil} -%global openHarmony_source_release OpenHarmony-v3.2-Release +%global oh_version OpenHarmony-v3.2-Release %global dfs_service_dir %{_builddir}/foundation/filemanagement %global build_opt /opt/distributed-middleware-build -Name: dfs_service +Name: filemanagement_dfs_service Version: 1.0.0 -Release: 2 -Summary: The distributed file service. -License: Apache License 2.0 +Release: 3 +Summary: The distributed file service from OpenHarmony +License: Apache-2.0 Url: https://gitee.com/openharmony/filemanagement_dfs_service -Source0: https://gitee.com/openharmony/filemanagement_dfs_service/repository/archive/%{openHarmony_source_release}.tar.gz #/filemanagement_dfs_service-%{openHarmony_source_release}.tar.gz -Patch0: 0001-cut-access_token-common_event-ability.patch -Patch1: 0002-change-default-devsl-from-0-to-4.patch +Source1: https://gitee.com/openharmony/filemanagement_dfs_service/repository/archive/%{oh_version}.tar.gz #/filemanagement_dfs_service-%{oh_version}.tar.gz +Patch1: 0001-cut-access_token-common_event-ability.patch +Patch2: 0002-change-default-devsl-from-0-to-4.patch -BuildRequires: distributed-build, libboundscheck, libatomic, distributed-utils -Requires: libboundscheck, libatomic, distributed-utils +BuildRequires: libboundscheck +BuildRequires: distributed-build +BuildRequires: distributed-beget, hilog, commonlibrary_c_utils +BuildRequires: communication_ipc, communication_dsoftbus +BuildRequires: systemabilitymgr_safwk, systemabilitymgr_samgr +BuildRequires: security_dataclassification, security_device_auth +BuildRequires: distributedhardware_device_manager + +Requires: libboundscheck +Requires: distributed-beget, hilog, commonlibrary_c_utils +Requires: communication_ipc, communication_dsoftbus +Requires: systemabilitymgr_safwk, systemabilitymgr_samgr +Requires: security_dataclassification, security_device_auth +Requires: distributedhardware_device_manager %description -The distributed file service provides cross -device access capabilities that meet the POSIX specifications. +The distributed file service provides cross-device access capabilities that meet the POSIX specifications. %prep -#clean %{_builddir} rm -rf %{_builddir}/* +cp -rf %{build_opt} %{_builddir}/build +ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh +ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn +ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py +cp -rf %{_builddir}/build/openeuler/vendor %{_builddir}/ +cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir} -# build directory -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 -cp -r %{_builddir}/build/openeuler/vendor %{_builddir}/ -cp -r %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}/ - -%setup -q -T -a 0 -c -n %{dfs_service_dir} -%patch0 -p1 -d %{dfs_service_dir}/dfs_service -%patch1 -p1 -d %{dfs_service_dir}/dfs_service - +%setup -q -T -a 1 -c -n %{dfs_service_dir} +%patch -P1 -p1 -d %{dfs_service_dir}/dfs_service +%patch -P2 -p1 -d %{dfs_service_dir}/dfs_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 -install -d %{buildroot}/%{_libdir} -install -d %{buildroot}/system/lib64 +install -d -m 0755 %{buildroot}/%{_libdir} +install -d -m 0755 %{buildroot}/system/lib64 + +%ifarch x86_64 +%define lib_path out/openeuler/linux_clang_x86_64/filemanagement/dfs_service +%endif + +%ifarch aarch64 +%define lib_path out/openeuler/linux_clang_arm64/filemanagement/dfs_service +%endif # prepare so -install -m 0755 %{_builddir}/out/openeuler/packages/phone/system/lib64/libdistributedfile*.so %{buildroot}/%{_libdir} -install -m 0755 %{_builddir}/out/openeuler/packages/phone/system/lib64/libdistributedfile*.so %{buildroot}/system/lib64 +install -m 0755 %{_builddir}/%{lib_path}/*.so %{buildroot}/%{_libdir} +install -m 0755 %{_builddir}/%{lib_path}/*.so %{buildroot}/system/lib64 %files %{_libdir}/*.so /system/lib64/*.so %changelog +* Tue Nov 14 2023 Peng He - 1.0.0-3 +- Update requires and buildrequires. + * Sat Jun 24 2023 Peng He - 1.0.0-2 - Change default devsl from 0 to 4. -- Gitee From d49b5a7a3a8e0d5b0f1a901ba91d029058c5ae6d Mon Sep 17 00:00:00 2001 From: heppen Date: Fri, 15 Dec 2023 15:47:28 +0800 Subject: [PATCH 2/2] add sa profile --- dfs_service.spec | 21 +++++++++++++++------ distributedfiledaemon.xml | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) create mode 100755 distributedfiledaemon.xml diff --git a/dfs_service.spec b/dfs_service.spec index 6daea30..236a22c 100644 --- a/dfs_service.spec +++ b/dfs_service.spec @@ -5,11 +5,13 @@ Name: filemanagement_dfs_service Version: 1.0.0 -Release: 3 +Release: 4 Summary: The distributed file service from OpenHarmony License: Apache-2.0 Url: https://gitee.com/openharmony/filemanagement_dfs_service Source1: https://gitee.com/openharmony/filemanagement_dfs_service/repository/archive/%{oh_version}.tar.gz #/filemanagement_dfs_service-%{oh_version}.tar.gz +Source2: distributedfiledaemon.xml + Patch1: 0001-cut-access_token-common_event-ability.patch Patch2: 0002-change-default-devsl-from-0-to-4.patch @@ -26,7 +28,7 @@ Requires: distributed-beget, hilog, commonlibrary_c_utils Requires: communication_ipc, communication_dsoftbus Requires: systemabilitymgr_safwk, systemabilitymgr_samgr Requires: security_dataclassification, security_device_auth -Requires: distributedhardware_device_manager +Requires: distributedhardware_device_manager, hmdfs %description The distributed file service provides cross-device access capabilities that meet the POSIX specifications. @@ -34,9 +36,9 @@ The distributed file service provides cross-device access capabilities that meet %prep rm -rf %{_builddir}/* cp -rf %{build_opt} %{_builddir}/build -ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh -ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn -ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py +[ ! -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 cp -rf %{_builddir}/build/openeuler/vendor %{_builddir}/ cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir} @@ -56,6 +58,7 @@ cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir} %install install -d -m 0755 %{buildroot}/%{_libdir} install -d -m 0755 %{buildroot}/system/lib64 +install -d -m 0755 %{buildroot}/system/profile %ifarch x86_64 %define lib_path out/openeuler/linux_clang_x86_64/filemanagement/dfs_service @@ -69,11 +72,17 @@ install -d -m 0755 %{buildroot}/system/lib64 install -m 0755 %{_builddir}/%{lib_path}/*.so %{buildroot}/%{_libdir} install -m 0755 %{_builddir}/%{lib_path}/*.so %{buildroot}/system/lib64 +# prepare sa profile +install -m 0755 %{SOURCE2} %{buildroot}/system/profile + %files %{_libdir}/*.so -/system/lib64/*.so +/system/* %changelog +* Fri Dec 15 2023 heppen - 1.0.0-4 +- Add SA profile + * Tue Nov 14 2023 Peng He - 1.0.0-3 - Update requires and buildrequires. diff --git a/distributedfiledaemon.xml b/distributedfiledaemon.xml new file mode 100755 index 0000000..129746e --- /dev/null +++ b/distributedfiledaemon.xml @@ -0,0 +1,16 @@ + + + distributedfiledaemon + + libdistributedfiledaemon.z.so + + + 5201 + libdistributedfiledaemon.z.so + 4802;4700 + 60000 + true + false + 1 + + -- Gitee