diff --git a/dpu-utilities-2.0.tar.gz b/dpu-utilities-2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5e39ff464bf8cb740e6e3d8de4b1d524262ee87b Binary files /dev/null and b/dpu-utilities-2.0.tar.gz differ diff --git a/dpu-utilities.spec b/dpu-utilities.spec index 7131f6a8f5b2490344b2b5d74fbc4d05cda009d3..92e05a75179096cc042f8dc1b976563168fd940b 100644 --- a/dpu-utilities.spec +++ b/dpu-utilities.spec @@ -1,7 +1,7 @@ Name: dpu-utilities Summary: openEuler dpu utilities -Version: 1.0 -Release: 4 +Version: 2.0 +Release: 1 License: GPL-2.0 Source: %{name}-%{version}.tar.gz ExclusiveOS: linux @@ -11,7 +11,6 @@ Conflicts: %{name} < %{version}-%{release} Provides: %{name} = %{version}-%{release} %define kernel_version %(ver=`rpm -qa|grep kernel-devel`;echo ${ver#*kernel-devel-}) BuildRequires: kernel-devel >= 5.10, gcc, make -Patch0001: 0001-fix-the-conditions-that-rsp-len-are-judged-to-be-inv.patch %description @@ -44,18 +43,24 @@ cd %_builddir/%{name}-%{version}/qtfs/qtfs make cd %_builddir/%{name}-%{version}/qtfs/qtfs_server make +cd %_builddir/%{name}-%{version}/qtfs/rexec +make %install mkdir -p $RPM_BUILD_ROOT/lib/modules/%{kernel_version}//extra mkdir -p $RPM_BUILD_ROOT/usr/bin/ mkdir -p $RPM_BUILD_ROOT/usr/src/patches +mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system install %_builddir/%{name}-%{version}/qtfs/qtfs/qtfs.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/extra install %_builddir/%{name}-%{version}/qtfs/qtfs_server/qtfs_server.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/extra install -m 0700 %_builddir/%{name}-%{version}/qtfs/qtfs_server/engine $RPM_BUILD_ROOT/usr/bin/ +install -m 0700 %_builddir/%{name}-%{version}/qtfs/rexec/rexec $RPM_BUILD_ROOT/usr/bin/ +install -m 0700 %_builddir/%{name}-%{version}/qtfs/rexec/rexec_server $RPM_BUILD_ROOT/usr/bin/ mkdir -p $RPM_BUILD_ROOT/opt/imageTailor cp -rf %_builddir/%{name}-%{version}/dpuos/image_tailor_cfg/custom $RPM_BUILD_ROOT/opt/imageTailor cp -rf %_builddir/%{name}-%{version}/dpuos/image_tailor_cfg/kiwi $RPM_BUILD_ROOT/opt/imageTailor cp -rf %_builddir/%{name}-%{version}/usecases/transparent-offload/patches/* $RPM_BUILD_ROOT/usr/src/patches/ +cp -rf %_builddir/%{name}-%{version}/qtfs/rexec/rexec.service $RPM_BUILD_ROOT/usr/lib/systemd/system/ %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,10 +89,16 @@ fi %files -n qtfs-client /lib/modules/%{kernel_version}/extra/qtfs.ko /usr/src/patches/ +%attr(0700, root, root) /usr/bin/rexec_server +%attr(0700, root, root) /usr/bin/rexec +/usr/lib/systemd/system/ %files -n qtfs-server /lib/modules/%{kernel_version}/extra/qtfs_server.ko %attr(0700, root, root) /usr/bin/engine +%attr(0700, root, root) /usr/bin/rexec_server +%attr(0700, root, root) /usr/bin/rexec +/usr/lib/systemd/system/ %files -n dpuos-imageTailor-config /opt/imageTailor/custom/* @@ -99,6 +110,8 @@ sed -i '/# product cut_conf/a\dpuos kiwi/minios/cfg_dpuos yes' /opt/imageT sed -i '//a\dpuos 1 rpm-dir euler_base' /opt/imageTailor/repos/RepositoryRule.conf %changelog +* Mon Nov 21 2022 yangxin <245051644@qq.com> 2.0-1 +- Add rexec to dpu_utilities. * Mon Aug 29 2022 yangxin <245051644@qq.com> 1.0-4 - Comment "return err" in dockerd patch to avoid error when docker loading. * Tue Aug 23 2022 yangxin <245051644@qq.com> 1.0-3