diff --git a/README.en.md b/README.en.md index 18d6d0ea32b0aa9a7857212eb4282cb2b4410048..8b1a3640454dbb1287f891457d98221f7fdd996e 100644 --- a/README.en.md +++ b/README.en.md @@ -1,7 +1,7 @@ # dpu-utilities #### Description -contain DPU utilities, like qtfs etc. +dpu-utilities is DPU customized software utility based on openEuler #### Software Architecture Software architecture description diff --git a/README.md b/README.md index 02e6d622f4f5193af4abb28f5baabb8fd567e7ca..2bf24d108819c61f19f7bfcc4b7829204a45fd3b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # dpu-utilities #### 介绍 -contain DPU utilities, like qtfs etc. +dpu-utilities is DPU customized software utility based on openEuler #### 软件架构 软件架构说明 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..d5e302ed92522e83ee79a52fc1fa8847629cc91c 100644 --- a/dpu-utilities.spec +++ b/dpu-utilities.spec @@ -1,18 +1,17 @@ Name: dpu-utilities Summary: openEuler dpu utilities -Version: 1.0 -Release: 2 +Version: 1.5 +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 +ExclusiveArch: x86_64 aarch64 URL: https://gitee.com/openeuler/dpu-utilities BuildRoot: %{_tmppath}/%{name}-%{version}-root 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: kernel-devel >= 5.10, gcc, make, json-c-devel, glib2-devel %description This package contains the software utilities on dpu. @@ -26,34 +25,67 @@ imageTailor configration files for dpuos %package -n qtfs-client Summary: Client of qtfs +Requires: json-c, glib2 %description -n qtfs-client qtfs is a shared file system, this is the client of qtfs. %package -n qtfs-server Summary: Server of qtfs +Requires: json-c, glib2 %description -n qtfs-server 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}-v%{version}/qtfs/qtfs_server make -cd %_builddir/%{name}-%{version}/qtfs/qtfs_server +cd %_builddir/%{name}-v%{version}/qtfs/rexec make +cd %_builddir/%{name}-v%{version}/qtfs/ipc +make +cd %_builddir/%{name}-v%{version}/qtfs/qtinfo +export role=client +make qtcfg +mv qtcfg qtcfg_client +make clean +export role=server +make qtcfg %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/ +mkdir -p $RPM_BUILD_ROOT/usr/lib/ +mkdir -p $RPM_BUILD_ROOT/usr/local/bin +mkdir -p $RPM_BUILD_ROOT/etc/qtfs +mkdir -p $RPM_BUILD_ROOT/etc/rexec +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/ +install -m 0700 %_builddir/%{name}-v%{version}/qtfs/ipc/udsproxyd ${RPM_BUILD_ROOT}/usr/bin/ +install -m 0700 %_builddir/%{name}-v%{version}/qtfs/ipc/libudsproxy.so ${RPM_BUILD_ROOT}/usr/lib/ +install -m 0700 %_builddir/%{name}-v%{version}/qtfs/qtinfo/qtcfg ${RPM_BUILD_ROOT}/usr/bin/ +install -m 0700 %_builddir/%{name}-v%{version}/qtfs/qtinfo/qtcfg_client ${RPM_BUILD_ROOT}/usr/local/bin/qtcfg +install -m 0400 %_builddir/%{name}-v%{version}/qtfs/config/rexec/whitelist ${RPM_BUILD_ROOT}/etc/rexec +install -m 0400 %_builddir/%{name}-v%{version}/qtfs/config/qtfs/whitelist ${RPM_BUILD_ROOT}/etc/qtfs 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 +%ifarch x86_64 +cp -rf %_builddir/%{name}-v%{version}/dpuos/image_tailor_cfg/x86_64/custom $RPM_BUILD_ROOT/opt/imageTailor +cp -rf %_builddir/%{name}-v%{version}/dpuos/image_tailor_cfg/x86_64/kiwi $RPM_BUILD_ROOT/opt/imageTailor +%endif +%ifarch aarch64 +cp -rf %_builddir/%{name}-v%{version}/dpuos/image_tailor_cfg/aarch64/custom $RPM_BUILD_ROOT/opt/imageTailor +cp -rf %_builddir/%{name}-v%{version}/dpuos/image_tailor_cfg/aarch64/kiwi $RPM_BUILD_ROOT/opt/imageTailor +%endif %clean rm -rf ${RPM_BUILD_ROOT} @@ -80,11 +112,22 @@ fi %files -n qtfs-client -/lib/modules/%{kernel_version}/extra/qtfs.ko +%attr(0644, root, root) /lib/modules/%{kernel_version}/extra/qtfs.ko +%attr(0500, root, root) /usr/bin/rexec_server +%attr(0500, root, root) /usr/bin/rexec +%attr(0500, root, root) /usr/lib/libudsproxy.so +%attr(0500, root, root) /usr/bin/udsproxyd +%attr(0500, root, root) /usr/local/bin/qtcfg +%attr(0400, root, root) /etc/rexec/whitelist %files -n qtfs-server -/lib/modules/%{kernel_version}/extra/qtfs_server.ko -%attr(0700, root, root) /usr/bin/engine +%attr(0644, root, root) /lib/modules/%{kernel_version}/extra/qtfs_server.ko +%attr(0500, root, root) /usr/bin/engine +%attr(0500, root, root) /usr/bin/rexec_server +%attr(0500, root, root) /usr/bin/rexec +%attr(0500, root, root) /usr/bin/qtcfg +%attr(0400, root, root) /etc/qtfs/whitelist +%attr(0400, root, root) /etc/rexec/whitelist %files -n dpuos-imageTailor-config /opt/imageTailor/custom/* @@ -96,6 +139,32 @@ 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 +* Thu Nov 23 2023 Guangxing Deng 1.5-1 +- Upgrade dpu-utilities version to 1.5 + +* Mon Aug 21 2023 Weifeng Su 1.4-3 +- Adapt for kernel 6.4 + +* Mon Jun 12 2023 Weifeng Su 1.4-2 +- Sync patches from source + +* Fri Jun 2 2023 Weifeng Su 1.4-1 +- Upgrade dpu-utilities version to 1.4 + +* Tue Mar 21 2023 Weifeng Su 1.3-1 +- Upgrade dpu-utilities version to 1.3 + +* Thu Dec 15 2022 YangXin <245051644@qq.com> 1.1-4 +- Fix inode sync error between client and server. +* Thu Dec 8 2022 Weifeng Su 1.1-3 +- Sync patches from master + +* Thu Dec 1 2022 Weifeng Su 1.1-2 +- add path put in xattr set + +* 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.5.tar.gz b/v1.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c3edaded445d91d67b3ce01d0ab994d900fca25f Binary files /dev/null and b/v1.5.tar.gz differ