From 8015ba38aa6e87d7071d36646c54862f298a9578 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 20 Dec 2024 10:48:17 +0800 Subject: [PATCH] adopt to new cmake macro --- oncn-bwm.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/oncn-bwm.spec b/oncn-bwm.spec index ae059a1..84c12a0 100644 --- a/oncn-bwm.spec +++ b/oncn-bwm.spec @@ -1,6 +1,6 @@ Name: oncn-bwm Version: 1.1 -Release: 9 +Release: 10 Summary: Pod bandwidth management in mixed deployment scenarios of online and offline services License: GPL-2.0 URL: https://gitee.com/src-openeuler/oncn-bwm @@ -37,21 +37,21 @@ devel tools for oncn-bwm %autosetup -n %{name}-%{version} -p1 %build -mkdir build && cd build && -cmake .. -make -cd ../ko +%cmake +%cmake_build + +cd ko make %install mkdir -p %{buildroot}/%{_bindir}/%{name} mkdir -p %{buildroot}/usr/share/bwmcli -install -Dpm 0400 %{_builddir}/%{name}-%{version}/build/bpf/CMakeFiles/bwm_prio_kern.dir/bwm_prio_kern.c.o %{buildroot}/usr/share/bwmcli/bwm_prio_kern.o -install -Dpm 0400 %{_builddir}/%{name}-%{version}/build/bpf/CMakeFiles/bwm_tc.dir/bwm_tc.c.o %{buildroot}/usr/share/bwmcli/bwm_tc.o -install -Dpm 0500 %{_builddir}/%{name}-%{version}/build/bwmcli %{buildroot}/%{_bindir} -install -Dpm 0500 %{_builddir}/%{name}-%{version}/tools/bwm_monitor.bt %{buildroot}/%{_bindir} +install -Dpm 0500 %{__cmake_builddir}/bpf/CMakeFiles/bwm_prio_kern.dir/bwm_prio_kern.c.o %{buildroot}/usr/share/bwmcli/bwm_prio_kern.o +install -Dpm 0500 %{__cmake_builddir}/bpf/CMakeFiles/bwm_tc.dir/bwm_tc.c.o %{buildroot}/usr/share/bwmcli/bwm_tc.o +install -Dpm 0500 %{__cmake_builddir}/bwmcli %{buildroot}/%{_bindir} +install -Dpm 0500 tools/bwm_monitor.bt %{buildroot}/%{_bindir} mkdir -p %{buildroot}/lib/modules/bwm -install %{_builddir}/%{name}-%{version}/ko/bwm.ko %{buildroot}/lib/modules/bwm +install ko/bwm.ko %{buildroot}/lib/modules/bwm %post ln -sf /lib/modules/bwm/bwm.ko /lib/modules/`uname -r` @@ -116,6 +116,9 @@ depmod -a %changelog +* Wed Dec 25 2024 Funda Wang - 1.1-10 +- adopt to new cmake maro + * Tue Dec 17 2024 liwei <1289113577@qq.com> - 1.1-9 - modify ebpf prog permissions -- Gitee