Compare commits

..

No commits in common. "a1fbce5e2a8a7e7fa31483ca7eca43378c54ea13" and "ce7e45be0a0f0267fd39da0078e270e35ce814aa" have entirely different histories.

2 changed files with 6 additions and 45 deletions

Binary file not shown.

View File

@ -1,9 +1,6 @@
# 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
@ -17,7 +14,7 @@
%endif
%if %{undefined rpm_release}
%define rpm_release B009
%define rpm_release B004
%endif
Name : umdk-urma
@ -25,14 +22,14 @@ Summary : Unified memory development kit
Version : %{rpm_version}
Release : %{rpm_release}
Group : nStack
License : GPL-2.0-only
License : Proprietary
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, systemd
BuildRequires : glib2-devel
Requires: glibc, glib2
%if %{with asan}
Requires: libasan
@ -47,13 +44,11 @@ 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
@ -77,7 +72,7 @@ Summary: binary file of urma
BuildRequires: gcc
Requires: glibc
%description bin
binary file of urma, contains tpsa_daemon, uvs_admin
binary file of urma, contains tpsa_daemon.
%endif
%prep
@ -88,9 +83,6 @@ binary file of urma, contains tpsa_daemon, uvs_admin
%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} \
@ -121,12 +113,9 @@ 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
%{_libdir}/liburma-hns3.so
%files devel
%defattr(-,root,root)
@ -137,6 +126,7 @@ 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)
@ -153,46 +143,17 @@ 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
* Thu Dec 12 2024 chenyutao <chenyutao2@huawei.com> - 1.3.0-B009
- Type:feature
- DESC:change license to gpl-xx-only
* Fri Mar 22 2024 panchenbo <panchenbo@kylinsec.com.cn> - 1.3.0-B008
- add BuildRequires:systemd for %{_unitdir} Macros
* Wed Nov 29 2023 Yizhen Fan <fanyizhen@huawei.com> - 1.3.0-B007
- Type:bugfix
- DESC:modify SO_REUSEADDR to SO_REUSEPORT
* Tue Nov 28 2023 Yizhen Fan <fanyizhen@huawei.com> - 1.3.0-B006
- Type:bugfix
- DESC:fix bugs detected in urma
* Thu Nov 23 2023 Yizhen Fan <fanyizhen@huawei.com> - 1.3.0-B005
- Type:feature
- DESC:add new feature for urma.
* Fri Oct 13 2023 Yizhen Fan <fanyizhen@huawei.com> - 1.3.0-B004
- Type:feature
- DESC:update source code, add hw hns3 lib