!6 原依赖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:30:07 +00:00 committed by Gitee
commit 404645b8e6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 56 additions and 5 deletions

36
0001-change-deps.patch Normal file
View File

@ -0,0 +1,36 @@
From 27dd6b8cc8ab09421ea4c073aaecaec32fe78049 Mon Sep 17 00:00:00 2001
From: heppen <hepeng68@huawei.com>
Date: Thu, 14 Dec 2023 22:18:27 +0800
Subject: [PATCH] change 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 b5c7cbd..bb9c693 100755
--- a/build/configs/system_deps.toml
+++ b/build/configs/system_deps.toml
@@ -29,7 +29,18 @@ package_deps = [
"cmake",
"wayland-devel",
"ft_engine-devel",
- "distributed-utils",
"distributed-build",
+ "distributed-beget",
+ "commonlibrary_c_utils",
+ "notification_eventhandler",
+ "communication_ipc",
+ "communication_dsoftbus",
+ "security_device_auth",
+ "security_huks",
+ "security_device_security_level",
+ "security_dataclassification",
+ "systemabilitymgr_safwk",
+ "systemabilitymgr_samgr",
+ "distributedhardware_device_manager",
"mesa-libEGL-devel",
]
--
2.33.0

View File

@ -15,7 +15,7 @@
Name: ft_wl_fwk
Version: 1.0.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Implementation of wayland-protocol
License: Apache-2.0
@ -24,11 +24,24 @@ Source0: https://gitee.com/openeuler/ft_wl_fwk/repository/archive/ft_wl_f
BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt
BuildRequires: llvm-devel wayland-devel
BuildRequires: distributed-utils ft_engine-devel ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel
BuildRequires: distributed-build mesa-libEGL mesa-libEGL-devel
Requires: compiler-rt llvm-devel python3
Requires: distributed-utils ft_engine ft_surface ft_mmi ft_flutter ft_multimedia mesa-libEGL mesa-libEGL-devel
BuildRequires: ft_engine-devel ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel
BuildRequires: mesa-libEGL mesa-libEGL-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
Requires: ft_engine ft_surface ft_mmi ft_flutter ft_multimedia mesa-libEGL mesa-libEGL-devel
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
Patch0: 0001-change-deps.patch
%description
ft_wl_fwk is implementation of wayland-protocol. The implementation is based on FangTian.
@ -60,6 +73,8 @@ rm -rf %{buildroot}
/system/profile/ft/*
%changelog
* Fri Dec 15 2023 Jiaqi Zhao <zhaojiaqi18@huawei.com> - 1.0.0-2
- Delete distributed-utils requires and update deps
* Mon Nov 6 2023 abc12133 <jinguoen@huawei.com> - 1.0.0-1
-