Jaroslav Škarvada
parent
58d4de4fcb
commit
06e22709bb
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (uhd-images_4.0.0.0.tar.xz) = 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
|
||||
SHA512 (uhd-4.0.0.0.tar.gz) = 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
|
||||
SHA512 (uhd-4.1.0.0.tar.gz) = b4d1510836d53ece449277749edb615ac8ba3be52853583e2e398994f7412151cbda513c4978e45e5bbf3642009d62bebdca9a615443ef9c8ff522ad4791b1ab
|
||||
SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
commit ae3d7551ded10ac51a3c2eda1e9e8ac64c4cd83b (HEAD -> fix-missing-includes-rpc, origin/fix-missing-includes-rpc)
|
||||
Author: Martin Braun <martin.braun@ettus.com>
|
||||
Date: Fri Jan 29 12:23:50 2021 +0100
|
||||
|
||||
lib: Fix missing includes in rpc.hpp
|
||||
|
||||
diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp
|
||||
index e87a2ee32..ca89c1054 100644
|
||||
--- a/host/lib/include/uhdlib/utils/rpc.hpp
|
||||
+++ b/host/lib/include/uhdlib/utils/rpc.hpp
|
||||
@@ -12,7 +12,11 @@
|
||||
#include <rpc/client.h>
|
||||
#include <rpc/rpc_error.h>
|
||||
#include <boost/format.hpp>
|
||||
+#include <chrono>
|
||||
#include <memory>
|
||||
+#include <mutex>
|
||||
+#include <string>
|
||||
+#include <thread>
|
||||
|
||||
namespace {
|
||||
43
uhd.spec
43
uhd.spec
|
|
@ -29,21 +29,36 @@
|
|||
|
||||
Name: uhd
|
||||
URL: http://github.com/EttusResearch/uhd
|
||||
Version: 4.0.0.0
|
||||
Release: 4%{?dist}
|
||||
Version: 4.1.0.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel
|
||||
BuildRequires: python3-docutils, doxygen, pkgconfig, libpcap-devel
|
||||
BuildRequires: python3-numpy, vim-common, libatomic
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: libusb1-devel
|
||||
BuildRequires: python3-cheetah
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: python3-docutils
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: python3-numpy
|
||||
BuildRequires: vim-common
|
||||
BuildRequires: libatomic
|
||||
%if %{with wireshark}
|
||||
BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel
|
||||
BuildRequires: wireshark-devel
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: gnutls-devel
|
||||
%endif
|
||||
BuildRequires: python3-mako, python3-requests, python3-devel, python3-setuptools, tar
|
||||
BuildRequires: python3-mako
|
||||
BuildRequires: python3-requests
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: tar
|
||||
%if ! %{with binary_firmware}
|
||||
BuildRequires: sdcc sed
|
||||
BuildRequires: sdcc
|
||||
BuildRequires: sed
|
||||
%endif
|
||||
Requires(pre): shadow-utils, glibc-common
|
||||
Requires: python3-tkinter
|
||||
|
|
@ -51,8 +66,6 @@ Summary: Universal Hardware Driver for Ettus Research products
|
|||
Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz
|
||||
Source1: %{name}-limits.conf
|
||||
Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz
|
||||
# Patch provided by upstream
|
||||
Patch0: uhd-4.0.0.0-gcc-11-fix.patch
|
||||
# https://github.com/EttusResearch/uhd/issues/410
|
||||
Patch1: uhd-4.0.0.0-s390x-build-fix.patch
|
||||
|
||||
|
|
@ -102,7 +115,6 @@ Wireshark dissector plugins.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .gcc-11-fix
|
||||
%patch1 -p1 -b .s390x-build-fix
|
||||
|
||||
# firmware
|
||||
|
|
@ -227,6 +239,7 @@ exit 0
|
|||
%{_bindir}/uhd_*
|
||||
%{_bindir}/usrp2_*
|
||||
%{_bindir}/rfnoc_image_builder
|
||||
%{_bindir}/usrp_hwd.py
|
||||
%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
|
||||
%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
|
||||
%{_libdir}/lib*.so.*
|
||||
|
|
@ -235,6 +248,7 @@ exit 0
|
|||
%{_mandir}/man1/*.1*
|
||||
%{_datadir}/uhd
|
||||
%{python3_sitearch}/uhd
|
||||
%{python3_sitearch}/usrp_mpm
|
||||
|
||||
%files firmware
|
||||
%dir %{_datadir}/uhd/images
|
||||
|
|
@ -253,6 +267,9 @@ exit 0
|
|||
%doc tools/README.md
|
||||
%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh
|
||||
%{_bindir}/chdr_log
|
||||
%{_bindir}/aurora_bist_test.py
|
||||
%{_bindir}/usrp_update_fs
|
||||
%{_bindir}/e320_bist
|
||||
|
||||
%if %{with wireshark}
|
||||
%files wireshark
|
||||
|
|
@ -260,6 +277,10 @@ exit 0
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 1 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#1976430
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.0.0.0-4
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue