packages/ft_utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
From: @zxstty 
Reviewed-by: @xieyijun3, @yanansong 
Signed-off-by: @xieyijun3, @yanansong
This commit is contained in:
openeuler-ci-bot 2023-12-15 06:45:24 +00:00 committed by Gitee
commit a8262c13bf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-update-kernel-dir-in-makefile.patch Normal file
View File

@ -0,0 +1,39 @@
From a94e38486e246812025baf65b2f3d33c6289ccce Mon Sep 17 00:00:00 2001
From: heppen <hepeng68@huawei.com>
Date: Fri, 15 Dec 2023 09:37:44 +0800
Subject: [PATCH] update kernel dir in makefile
---
ashmem/src/Makefile | 2 +-
binder/src/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ashmem/src/Makefile b/ashmem/src/Makefile
index f11e08b..301a5ba 100644
--- a/ashmem/src/Makefile
+++ b/ashmem/src/Makefile
@@ -5,7 +5,7 @@ obj-m := ashmem_linux.o
ashmem_linux-y := deps.o ashmem.o
else
-KERNEL_SRC ?= /lib/modules/$(shell dir /lib/modules)/build
+KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
all:
$(MAKE) -C $(KERNEL_SRC) V=0 M=$$PWD
diff --git a/binder/src/Makefile b/binder/src/Makefile
index 74858b1..3c0b52d 100644
--- a/binder/src/Makefile
+++ b/binder/src/Makefile
@@ -5,7 +5,7 @@ ifneq ($(KERNELRELEASE),)
obj-m := binder_linux.o
binder_linux-y := deps.o binder.o binder_alloc.o
else
-KERNEL_SRC ?= /lib/modules/$(shell dir /lib/modules)/build
+KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
all:
$(MAKE) -C $(KERNEL_SRC) V=0 M=$$PWD
--
2.33.0

25
ft_utils.spec
View File

@ -17,21 +17,32 @@
Name: ft_utils
Version: 1.0.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: common library
License: Apache-2.0
URL: https://gitee.com/openeuler/ft_utils
Source0: https://gitee.com/openeuler/ft_utils/repository/archive/ft_utils-1.0.0.tar.gz
Source1: https://gitee.com/openeuler/ft_utils/repository/archive/kernel_binder.tar.gz
Patch0: 0001-update-kernel-dir-in-makefile.patch
BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt
BuildRequires: llvm-devel
BuildRequires: distributed-utils
BuildRequires: distributed-build
BuildRequires: kernel-devel
BuildRequires: kernel-devel uname-build-checks
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: distributed-utils
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
ft_utils module is a base commom library for ft_engine.
@ -40,6 +51,7 @@ ft_utils module is a base commom library for ft_engine.
%setup -q -D -T -a 0 -c -n %{_builddir}
%setup -q -D -T -a 1 -c -n %{_builddir}
%patch -P0 -p1 -d %{_builddir}/kernel_binder
%build
%if 0%{?with_eventhandler_lib}
@ -88,6 +100,9 @@ insmod /usr/share/sa/binder_linux.ko
%endif
%changelog
* Thu Dec 14 2023 Peng He <hepeng68@huawei.com> - 1.0.0-2
- Update kernel dir in makefile
* Mon Nov 6 2023 abc12133 <jinguoen@huawei.com> - 1.0.0-1
-