diff --git a/dpu-utilities-1.0.tar.gz b/dpu-utilities-1.0.tar.gz deleted file mode 100644 index fce3c521161c73da1a9e93686e57baf0126076f8..0000000000000000000000000000000000000000 Binary files a/dpu-utilities-1.0.tar.gz and /dev/null differ diff --git a/dpu-utilities.spec b/dpu-utilities.spec index 2fa3cc59c537c5208cc8041287bb54bd22b05389..0e553887c84590d0e300796d7449c9bd82b3a7cb 100644 --- a/dpu-utilities.spec +++ b/dpu-utilities.spec @@ -1,9 +1,9 @@ Name: dpu-utilities Summary: openEuler dpu utilities -Version: 1.0 -Release: 2 +Version: 1.1 +Release: 1 License: GPL-2.0 -Source: %{name}-%{version}.tar.gz +Source: https://gitee.com/openeuler/dpu-utilities/repository/archive/v%{version}.tar.gz ExclusiveOS: linux URL: https://gitee.com/openeuler/dpu-utilities BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -11,8 +11,7 @@ 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 - - +BuildRequires: golang %description This package contains the software utilities on dpu. @@ -37,23 +36,29 @@ Summary: Server of qtfs qtfs is a shared file system, this is the server of qtfs. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-v%{version} -p1 %build -cd %_builddir/%{name}-%{version}/qtfs/qtfs +sed -i "s#KBUILD=.*#KBUILD=/lib/modules/%{kernel_version}/build#" %_builddir/%{name}-v%{version}/qtfs/qtfs/Makefile +sed -i "s#KBUILD=.*#KBUILD=/lib/modules/%{kernel_version}/build#" %_builddir/%{name}-v%{version}/qtfs/qtfs_server/Makefile +cd %_builddir/%{name}-v%{version}/qtfs/qtfs make -cd %_builddir/%{name}-%{version}/qtfs/qtfs_server +cd %_builddir/%{name}-v%{version}/qtfs/qtfs_server +make +cd %_builddir/%{name}-v%{version}/qtfs/rexec make %install mkdir -p $RPM_BUILD_ROOT/lib/modules/%{kernel_version}//extra mkdir -p $RPM_BUILD_ROOT/usr/bin/ -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 %_builddir/%{name}-v%{version}/qtfs/qtfs/qtfs.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/extra +install %_builddir/%{name}-v%{version}/qtfs/qtfs_server/qtfs_server.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/extra +install -m 0700 %_builddir/%{name}-v%{version}/qtfs/qtfs_server/engine $RPM_BUILD_ROOT/usr/bin/ +install -m 0700 %_builddir/%{name}-v%{version}/qtfs/rexec/rexec ${RPM_BUILD_ROOT}/usr/bin/ +install -m 0700 %_builddir/%{name}-v%{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}-v%{version}/dpuos/image_tailor_cfg/custom $RPM_BUILD_ROOT/opt/imageTailor +cp -rf %_builddir/%{name}-v%{version}/dpuos/image_tailor_cfg/kiwi $RPM_BUILD_ROOT/opt/imageTailor %clean rm -rf ${RPM_BUILD_ROOT} @@ -81,10 +86,14 @@ fi %files -n qtfs-client /lib/modules/%{kernel_version}/extra/qtfs.ko +%attr(0700, root, root) /usr/bin/rexec_server +%attr(0700, root, root) /usr/bin/rexec %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 %files -n dpuos-imageTailor-config /opt/imageTailor/custom/* @@ -96,6 +105,9 @@ 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 28 2022 Weifeng Su 1.1-1 +- Upgrade dpu-utilities version to 1.1 + * Wed Aug 17 2022 yangxin <245051644@qq.com> 1.0-2 - Split dpu-utilities into three packages. * Fri Aug 12 2022 yangxin <245051644@qq.com> 1.0-1 diff --git a/v1.1.tar.gz b/v1.1.tar.gz new file mode 100755 index 0000000000000000000000000000000000000000..9a38baa8ef719584d666f446bc46a73e6391a81e Binary files /dev/null and b/v1.1.tar.gz differ