diff --git a/umdk-urma-1.3.0.tar.gz b/umdk-urma-1.3.0.tar.gz index 9bb99cecce0d97de48c7c76a8ff229614e89329d..13c22a7a450f2f2d1e945ad8929df904df4ee06d 100644 Binary files a/umdk-urma-1.3.0.tar.gz and b/umdk-urma-1.3.0.tar.gz differ diff --git a/umdk-urma.spec b/umdk-urma.spec index ed72314eb831e7738ecd2ad1d3385d7a9a51861d..cbe486af9b7c326a223994b217858e75cae111d5 100644 --- a/umdk-urma.spec +++ b/umdk-urma.spec @@ -1,6 +1,9 @@ # add --with transport_service_disable option, i.e. enable TPS by default %bcond_with transport_service_disable +# add --with hw_disable option, i.e. enable HW by default +%bcond_with hw_disable + %if %{defined kernel_version} %define kernel_build_path /lib/modules/%{kernel_version}/build %else @@ -14,7 +17,7 @@ %endif %if %{undefined rpm_release} - %define rpm_release B003 + %define rpm_release B010 %endif Name : umdk-urma @@ -22,14 +25,14 @@ Summary : Unified memory development kit Version : %{rpm_version} Release : %{rpm_release} Group : nStack -License : Proprietary +License : GPL-2.0-only Provides : Huawei Technologies Co., Ltd Source0 : %{name}-%{version}.tar.gz BuildRoot : %{_buildirootdir}/%{name}-%{version}-build BuildArch : x86_64 aarch64 ExclusiveArch : aarch64 BuildRequires : rpm-build, make, cmake, gcc, gcc-c++, glibc-devel -BuildRequires : glib2-devel +BuildRequires : glib2-devel, systemd, libnl3-devel, openssl-devel Requires: glibc, glib2 %if %{with asan} Requires: libasan @@ -44,6 +47,14 @@ Summary: Basic URMA libraries of UMDK %description lib This package contains basic URMA libraries of UMDK, such as liburma.so. +%if %{without hw_disable} +%package compat-hns-lib +Summary: Libraries of hns + +%description compat-hns-lib +This pachage contains libraries of hns, such as liburma-hns3.so. +%endif + %package devel Summary: Include Files and Libraries mandatory for URMA Requires: umdk-urma-lib = %{version} @@ -66,7 +77,7 @@ Summary: binary file of urma BuildRequires: gcc Requires: glibc %description bin -binary file of urma, contains tpsa_daemon. +binary file of urma, contains tpsa_daemon, uvs_admin %endif %prep @@ -77,6 +88,9 @@ binary file of urma, contains tpsa_daemon. %if %{with transport_service_disable} -DTPS="disable" \ %endif +%if %{with hw_disable} + -DHW="disable" \ +%endif %if %{defined kernel_version} -DKERNEL_RELEASE=%{kernel_version} \ -DKERNEL_PATH=%{kernel_build_path} \ @@ -107,6 +121,13 @@ if [ -x %{_bindir}/systemctl ] && [ -x %{_sbindir}/rsyslogd ]; then %{_bindir}/systemctl restart rsyslog >/dev/null 2>&1 fi +%if %{without hw_disable} +%files compat-hns-lib +%defattr(-,root,root) + %dir %{_libdir}/urma + %{_libdir}/urma/liburma-hns3.so +%endif + %files devel %defattr(-,root,root) %dir %{_includedir}/umdk @@ -116,7 +137,6 @@ fi %{_includedir}/umdk/urma_provider.h %{_includedir}/umdk/common/ub_*.h %{_includedir}/umdk/common/urma_*.h - %{_includedir}/umdk/common/compiler.h %files tools %defattr(-,root,root) @@ -133,17 +153,52 @@ fi %files bin %defattr(-,root,root) %{_sbindir}/tpsa_daemon + %{_sbindir}/uvs_daemon + %attr(0700,-,-) %{_bindir}/uvs_admin /etc/rsyslog.d/tpsa.conf + /etc/rsyslog.d/uvs_admin.conf /etc/logrotate.d/tpsa %dir /etc/tpsa + %{_libdir}/libtpsa.so + %{_libdir}/libtpsa.so.0 + %{_libdir}/libtpsa.so.0.0.1 + %attr(0644,-,-) %{_unitdir}/uvsd.service %config(noreplace) /etc/tpsa/tpsa.ini %post bin +if [ -x %{_bindir}/systemctl ]; then + %{_bindir}/systemctl daemon-reload >/dev/null 2>&1 +fi if [ -x %{_bindir}/systemctl ] && [ -x %{_sbindir}/rsyslogd ]; then %{_bindir}/systemctl restart rsyslog >/dev/null 2>&1 fi %endif %changelog +*Wed June 5 2024 WenChen - 1.3.0-B010 +- fix bugs urma_perftest init + +* Wed May 22 2024 WenChen - 1.3.0-B009 +- add sync urma_tag + +* Fri Mar 22 2024 panchenbo - 1.3.0-B008 +- add BuildRequires:systemd for %{_unitdir} Macros + +* Wed Nov 29 2023 Yizhen Fan - 1.3.0-B007 +- Type:bugfix +- DESC:modify SO_REUSEADDR to SO_REUSEPORT + +* Tue Nov 28 2023 Yizhen Fan - 1.3.0-B006 +- Type:bugfix +- DESC:fix bugs detected in urma + +* Thu Nov 23 2023 Yizhen Fan - 1.3.0-B005 +- Type:feature +- DESC:add new feature for urma. + +* Fri Oct 13 2023 Yizhen Fan - 1.3.0-B004 +- Type:feature +- DESC:update source code, add hw hns3 lib + * Wed Oct 11 2023 Yizhen Fan - 1.3.0-B003 - Type:bugfix - DESC:change name of spec to umdk-urma