From 811f13bbc5c73c6f500f6b17045dc28ab6785bae Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 07:05:13 +0000 Subject: [PATCH 1/3] update ft_utils.spec. Signed-off-by: zxstty --- ft_utils.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ft_utils.spec b/ft_utils.spec index 481d0ff..2506d3f 100644 --- a/ft_utils.spec +++ b/ft_utils.spec @@ -27,11 +27,21 @@ Source1: https://gitee.com/openeuler/ft_utils/repository/archive/kernel_b 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: distributed-build distributed-beget +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 +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. From c13e357e61a0799125859885dcd34fcd3407748a Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 08:06:30 +0000 Subject: [PATCH 2/3] update ft_utils.spec. Signed-off-by: zxstty --- ft_utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_utils.spec b/ft_utils.spec index 2506d3f..f29eb50 100644 --- a/ft_utils.spec +++ b/ft_utils.spec @@ -28,7 +28,7 @@ Source1: https://gitee.com/openeuler/ft_utils/repository/archive/kernel_b BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt BuildRequires: llvm-devel BuildRequires: kernel-devel -BuildRequires: distributed-build distributed-beget +BuildRequires: distributed-build distributed-beget distributedhardware_device_manager BuildRequires: commonlibrary_c_utils BuildRequires: notification_eventhandler BuildRequires: communication_ipc communication_dsoftbus @@ -36,7 +36,7 @@ BuildRequires: security_device_auth security_huks security_device_security_leve BuildRequires: systemabilitymgr_safwk systemabilitymgr_samgr Requires: compiler-rt llvm-devel python3 -Requires: distributed-beget +Requires: distributed-beget distributedhardware_device_manager Requires: commonlibrary_c_utils Requires: notification_eventhandler Requires: communication_ipc communication_dsoftbus From 381f1c53a576d11f26c268f76e8681a54e2da778 Mon Sep 17 00:00:00 2001 From: heppen Date: Fri, 15 Dec 2023 10:08:54 +0800 Subject: [PATCH 3/3] update kernel dir in makefile --- 0001-update-kernel-dir-in-makefile.patch | 39 ++++++++++++++++++++++++ ft_utils.spec | 9 ++++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 0001-update-kernel-dir-in-makefile.patch diff --git a/0001-update-kernel-dir-in-makefile.patch b/0001-update-kernel-dir-in-makefile.patch new file mode 100644 index 0000000..3a90224 --- /dev/null +++ b/0001-update-kernel-dir-in-makefile.patch @@ -0,0 +1,39 @@ +From a94e38486e246812025baf65b2f3d33c6289ccce Mon Sep 17 00:00:00 2001 +From: heppen +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 + diff --git a/ft_utils.spec b/ft_utils.spec index f29eb50..c520f42 100644 --- a/ft_utils.spec +++ b/ft_utils.spec @@ -17,17 +17,18 @@ 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: kernel-devel +BuildRequires: kernel-devel uname-build-checks BuildRequires: distributed-build distributed-beget distributedhardware_device_manager BuildRequires: commonlibrary_c_utils BuildRequires: notification_eventhandler @@ -50,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} @@ -98,6 +100,9 @@ insmod /usr/share/sa/binder_linux.ko %endif %changelog +* Thu Dec 14 2023 Peng He - 1.0.0-2 +- Update kernel dir in makefile + * Mon Nov 6 2023 abc12133 - 1.0.0-1 -