!9 原依赖distributed-utils拆分为12个组件,修改了spec和system_deps.toml中对distributed-utils的依赖

From: @zxstty 
Reviewed-by: @xieyijun3 
Signed-off-by: @xieyijun3
This commit is contained in:
openeuler-ci-bot 2023-12-15 06:29:29 +00:00 committed by Gitee
commit deb7388673
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 56 additions and 5 deletions

View File

@ -0,0 +1,35 @@
From a3610b0a3aaedc3e80373f6fd76b1b71b9b77982 Mon Sep 17 00:00:00 2001
From: heppen <hepeng68@huawei.com>
Date: Thu, 14 Dec 2023 17:18:17 +0800
Subject: [PATCH] update system deps
---
build/configs/system_deps.toml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml
index 02c834b..18aba2b 100755
--- a/build/configs/system_deps.toml
+++ b/build/configs/system_deps.toml
@@ -43,6 +43,17 @@ package_deps = [
"cjson-devel",
# GPU render
"openssl-devel",
- "distributed-utils",
+ "distributed-beget",
+ "distributedhardware_device_manager",
+ "commonlibrary_c_utils",
+ "notification_eventhandler",
+ "communication_ipc",
+ "communication_dsoftbus",
+ "security_device_auth",
+ "security_huks",
+ "security_device_security_level",
+ "security_dataclassification",
+ "systemabilitymgr_safwk",
+ "systemabilitymgr_samgr",
"distributed-build",
]
--
2.33.0

View File

@ -15,27 +15,40 @@
Name: ft_engine Name: ft_engine
Version: 1.0.0 Version: 1.0.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Ft_engine consists of window display and window management, providing the core capabilities of the Windows engine. Summary: Ft_engine consists of window display and window management, providing the core capabilities of the Windows engine.
License: Apache-2.0 License: Apache-2.0
URL: https://gitee.com/openeuler/ft_engine URL: https://gitee.com/openeuler/ft_engine
Source0: https://gitee.com/openeuler/ft_engine/repository/archive/ft_engine-1.0.0.tar.gz Source0: https://gitee.com/openeuler/ft_engine/repository/archive/ft_engine-1.0.0.tar.gz
Patch0: 0001-update-system-deps.patch
BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt
BuildRequires: llvm-devel gtest-devel harfbuzz-devel libxml2-devel libpng-devel libicu wayland-devel libdrm-devel systemd-pam systemd-devel libexif-devel cjson-devel BuildRequires: llvm-devel gtest-devel harfbuzz-devel libxml2-devel libpng-devel libicu wayland-devel libdrm-devel systemd-pam systemd-devel libexif-devel cjson-devel
BuildRequires: distributed-utils ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel BuildRequires: ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel
BuildRequires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers BuildRequires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers
BuildRequires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm BuildRequires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm
BuildRequires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers BuildRequires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers
BuildRequires: libjpeg-devel distributed-build BuildRequires: libjpeg-devel
BuildRequires: distributed-build distributed-beget distributedhardware_device_manager
BuildRequires: commonlibrary_c_utils
BuildRequires: notification_eventhandler
BuildRequires: communication_ipc communication_dsoftbus
BuildRequires: security_device_auth security_huks security_device_security_level security_dataclassification
BuildRequires: systemabilitymgr_safwk systemabilitymgr_samgr
Requires: compiler-rt llvm-devel python3 libdrm-devel systemd-devel harfbuzz-devel jsoncpp-devel expat-devel Requires: compiler-rt llvm-devel python3 libdrm-devel systemd-devel harfbuzz-devel jsoncpp-devel expat-devel
Requires: distributed-utils ft_surface ft_mmi ft_flutter ft_multimedia Requires: ft_surface ft_mmi ft_flutter ft_multimedia
Requires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers Requires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers
Requires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm Requires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm
Requires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers Requires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers
Requires: libjpeg-turbo Requires: libjpeg-turbo
Requires: distributed-beget distributedhardware_device_manager
Requires: commonlibrary_c_utils
Requires: notification_eventhandler
Requires: communication_ipc communication_dsoftbus
Requires: security_device_auth security_huks security_device_security_level security_dataclassification
Requires: systemabilitymgr_safwk systemabilitymgr_samgr
%description %description
Ft_engine consists of window display and window management, providing the core capabilities of the Windows engine. Ft_engine consists of window display and window management, providing the core capabilities of the Windows engine.
@ -364,5 +377,8 @@ rm -rf %{buildroot}
%{_includedir}/* %{_includedir}/*
%changelog %changelog
* Fri Dec 15 2023 Jiaqi Zhao <zhaojiaqi18@huawei.com> - 1.0.0-2
- Delete distributed-utils requires and update deps
* Tue Oct 10 2023 xieyijun3 <xieyijun3@huawei.com> - 1.0.0-1 * Tue Oct 10 2023 xieyijun3 <xieyijun3@huawei.com> - 1.0.0-1
- -