Compare commits

..

92 commits

Author SHA1 Message Date
Python Maint
acfe813c92 Rebuilt for Python 3.15.0b4 ABI change 2026-07-22 10:11:19 +02:00
Fedora Release Engineering
69834dded8 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:08:18 +00:00
Python Maint
77495c7172 Rebuilt for Python 3.15 2026-06-04 09:33:17 +02:00
Jaroslav Škarvada
1c486dd191 New version
Resolves: rhbz#2451594
2026-04-28 13:38:36 +02:00
Fedora Release Engineering
23b5fbbc67 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-20 03:31:08 +00:00
Jaroslav Škarvada
1baf9fd961 Fixed build with cmake-4
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-01-13 16:35:41 +01:00
5c4d17f8f5 Rebuilt for Boost 1.90 2026-01-12 18:30:39 +00:00
Jaroslav Škarvada
ff6fd8bff6 New version
Resolves: rhbz#2403533
2025-10-13 17:25:34 +02:00
Python Maint
0808e1d684 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 15:01:00 +02:00
Jaroslav Škarvada
df04e96c52 Dropped chdr_log as upstream
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-12 00:35:43 +02:00
Jaroslav Škarvada
e1213c9be0 Followed upstream and dropped uhd_dump
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-11 18:17:57 +02:00
Jaroslav Škarvada
9f6339d121 Dropped unneeded patch
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-11 18:02:10 +02:00
Jaroslav Škarvada
fd8faa4c64 New version
Resolves: rhbz#2387862
2025-09-11 17:50:59 +02:00
Python Maint
e22a339e17 Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 15:21:21 +02:00
Fedora Release Engineering
e93033b410 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:44:33 +00:00
Python Maint
c79fdf3ba9 Rebuilt for Python 3.14 2025-06-03 14:31:02 +02:00
Jaroslav Škarvada
ae45f0b982 New version
Resolves: rhbz#2337610
  Resolves: rhbz#2341478

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-03-17 10:24:55 +01:00
1538edcbf9 Add sysusers.d config file to allow rpm to create users/groups automatically
See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
2025-02-11 17:03:11 +01:00
Fedora Release Engineering
b09e6d0822 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:40:27 +00:00
Miroslav Suchý
212b456b65 convert GPLv3+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-25 13:29:06 +02:00
Fedora Release Engineering
249f71537f Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:11:17 +00:00
Jaroslav Škarvada
32d9ecc659 New version
Resolves: rhbz#2293732
2024-07-15 16:36:07 +02:00
Python Maint
1b6120a7b3 Rebuilt for Python 3.13 2024-06-08 22:34:34 +02:00
Software Management Team
f07315bd68 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:49 +02:00
Fedora Release Engineering
87fb805ffa Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:02:27 +00:00
Jonathan Wakely
85558aa0e5 Rebuilt for Boost 1.83 2024-01-18 00:50:07 +00:00
Jaroslav Škarvada
a51621a3f9 New version
Resolves: rhbz#2247579
2023-11-21 14:30:29 +01:00
Jaroslav Škarvada
b3de8665ea New version
Resolves: rhbz#2237074
2023-09-25 13:58:33 +02:00
Fedora Release Engineering
f928391d8d Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:02:35 +00:00
Python Maint
7ba9c549ea Rebuilt for Python 3.12 2023-06-14 20:24:03 +02:00
Dmitry V. Levin
bdf88f038a 11-dm-mpath.rules: fix warnings reported by udevadm verify
Fix the following warnings reported by udevadm verify:

10-usrp-uhd.rules:9 A comma between tokens is expected.
10-usrp-uhd.rules:12 A comma between tokens is expected.
10-usrp-uhd.rules:15 A comma between tokens is expected.
10-usrp-uhd.rules:16 A comma between tokens is expected.
10-usrp-uhd.rules:17 A comma between tokens is expected.
10-usrp-uhd.rules:18 A comma between tokens is expected.
10-usrp-uhd.rules:19 A comma between tokens is expected.
10-usrp-uhd.rules: udev rules check failed
2023-05-19 08:00:00 +00:00
Jonathan Wakely
e6450ed1a0 Rebuilt for Boost 1.81 2023-02-20 21:57:26 +00:00
Jaroslav Škarvada
1320ace558 New version
Resolves: rhbz#2164284
2023-02-01 17:39:19 +01:00
Fedora Release Engineering
def8e2df85 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:44:28 +00:00
Jaroslav Škarvada
435955a718 New version
Resolves: rhbz#2124734
2022-09-24 18:17:23 +02:00
Jaroslav Škarvada
b9d08a4ba6 New version
Resolves: rhbz#2110023
2022-07-29 23:30:17 +02:00
Fedora Release Engineering
8c8cb59a33 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:19:11 +00:00
Miro Hrončok
f11fa01adb Unbundle pybind11 to fix FTBFS with Python 3.11
Fedora's pybind11 is already fixed.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2099182
2022-06-21 14:24:16 +02:00
Jaroslav Škarvada
e5fb6d4070 Rebuilt for new python
Resolves: rhbz#2099182
2022-06-20 12:27:34 +02:00
Thomas Rodgers
4047fb8169 Rebuilt for Boost 1.78 2022-05-04 11:42:27 +02:00
Jaroslav Škarvada
1bc8bc1e0f Fixed FTBFS
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2022-04-21 21:32:44 +02:00
Jaroslav Škarvada
875ad9bdff New version
Resolves: rhbz#2073640
2022-04-21 15:04:27 +02:00
Jaroslav Škarvada
613bc2470d Switched to the upstream patch to fix compilation on the s390x 2022-02-01 01:06:00 +01:00
Jaroslav Škarvada
49229bd6ae Fixed images path 2022-01-29 00:40:07 +01:00
Jaroslav Škarvada
87d004a0af Defuzzified s390x patch 2022-01-28 16:41:50 +01:00
Fedora Release Engineering
7878961774 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:27:22 +00:00
Jaroslav Škarvada
c14745893a New version
Resolves: rhbz#2029036
2021-12-15 22:29:50 +01:00
Jaroslav Škarvada
70d4bfb9a0 New version
Resolves: rhbz#2006293
2021-10-04 19:38:52 +02:00
Jaroslav Škarvada
d7f5921e6e New version
Resolves: rhbz#1989976
2021-09-13 19:04:39 +02:00
Jonathan Wakely
c279d53123 Rebuilt for Boost 1.76 2021-08-06 23:55:47 +01:00
Fedora Release Engineering
f4c63bf986 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 19:58:22 +00:00
Jaroslav Škarvada
f35eda7fad New version
Resolves: rhbz#1982075
2021-07-14 20:44:48 +02:00
Jaroslav Škarvada
06e22709bb New version
Resolves: rhbz#1976430
2021-07-02 19:26:00 +02:00
Python Maint
58d4de4fcb Rebuilt for Python 3.10 2021-06-04 21:18:44 +02:00
Tomas Hrnciar
dff1e9b219 BuildRequire setuptools explicitly
See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools
2021-04-19 13:18:32 +02:00
Jonathan Wakely
53309a5cf1 Rebuilt for removed libstdc++ symbol (#1937698) 2021-03-30 19:36:21 +01:00
Jaroslav Škarvada
9accf032da Fixed requires for wireshark plugin
Resolves: rhbz#1925577
2021-02-08 14:48:58 +01:00
Jaroslav Škarvada
d5dbfb93a1 Fixed requires for wireshark plugin
Resolves: rhbz#1925577
2021-02-08 12:27:53 +01:00
Jaroslav Škarvada
addbe90df6 Added workaround for s390x FTBFS
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2021-02-02 22:15:28 +01:00
Jaroslav Škarvada
b8f61d0e94 FTBFS fixes
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2021-02-01 21:01:45 +01:00
Jaroslav Škarvada
7e9476da6c Added fix for gcc-11
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2021-01-26 01:19:00 +01:00
Jaroslav Škarvada
9833c761ac New version
Resolves: rhbz#1918161
2021-01-26 00:54:58 +01:00
Jonathan Wakely
653a3d51a1 Rebuilt for Boost 1.75 2021-01-22 20:53:53 +00:00
Tom Stellard
96f2e1b8e1 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:21:18 +00:00
Jeff Law
c31974efbc Fix missing #includes for gcc-11 2020-12-04 21:03:00 -07:00
Jaroslav Škarvada
11aa984027 Made doc arch due to bug in doxygen
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2020-08-05 14:28:32 +02:00
Jaroslav Škarvada
ea7ad13ad3 Fixed FTBFS
Resolves: rhbz#1865590
2020-08-05 13:16:04 +02:00
Fedora Release Engineering
a7d22bb7bc - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 09:32:20 +00:00
Fedora Release Engineering
d6be796032 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:13:12 +00:00
Jonathan Wakely
745534ebab Rebuilt and patched for Boost 1.73 2020-06-03 15:38:12 +01:00
Miro Hrončok
562e4f234e Rebuilt for Python 3.9 2020-05-26 03:53:57 +02:00
Jaroslav Škarvada
dc44499c2a Provided uhd modules directory 2020-04-17 00:43:05 +02:00
Fedora Release Engineering
79545f3585 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 02:30:22 +00:00
Jaroslav Škarvada
294a499e1c Added sources
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2019-11-08 23:53:31 +01:00
Jaroslav Škarvada
5c46cca850 New version
Switched to Python 3
  Resolves: rhbz#1738157
2019-11-08 23:49:25 +01:00
Jaroslav Škarvada
ef6944b8f3 New version
Disabled tests
  Resolves: rhbz#1736932
2019-08-03 13:31:33 +02:00
Fedora Release Engineering
556c7d8985 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 02:23:27 +00:00
Jaroslav Škarvada
35e76b3bd9 New git snapshot
Added python2-numpy build requirement
Re-enabled tests for upstream to easily reproduce the problem
2019-04-23 18:21:38 +02:00
Jaroslav Škarvada
2a6210da45 New version, switched to git snapshot
Conditionalized wireshark support
Disabled wireshark support, it's currently broken (upstream ticket #268)
Disabled tests, it's currently broken (upstream ticket #267)
Dropped boost169 patch (not needed)
2019-04-15 23:15:36 +02:00
Jaroslav Škarvada
111f9ee51b Re-introduced usrp group
Resolves: rhbz#1694665
2019-04-01 17:11:18 +02:00
Fedora Release Engineering
542078bc8c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 10:43:10 +00:00
Jonathan Wakely
a2c39162a5 Add upstream patches for Boost 1.69.0 header changes 2019-01-29 20:36:17 +00:00
8a02e6901a Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:53 +01:00
Jonathan Wakely
3d4360b098 Rebuilt for Boost 1.69 2019-01-25 03:52:23 +00:00
9a27b4cb85
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:41:14 +01:00
Jaroslav Škarvada
2ce414616e Fixed generated python scripts shebangs
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2018-12-10 18:07:13 +01:00
Jaroslav Škarvada
9ae7392f8a Fixed python shebangs
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2018-12-10 15:00:51 +01:00
Jaroslav Škarvada
c6524f2070 Rebuilt for new gnuradio
Resolves: rhbz#1625012
2018-12-10 14:44:09 +01:00
Jaroslav Škarvada
1c1fbfd088 New version
Resolves: rhbz#1606606
Dropped sdcc-3-fix patch (upstreamed)
Dropped boost-gcc8-compile-fix patch (not needed)
Packaged wireshark dissectors
2018-07-22 01:44:41 +02:00
Fedora Release Engineering
2b7eeda2e1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:10:39 +00:00
Igor Gnatenko
e802d15cef add BuildRequires: gcc-c++
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:52 +02:00
Iryna Shcherbina
a0832cf2cd Update Python 2 dependency declarations to new packaging standards 2018-02-28 07:37:59 +01:00
5 changed files with 388 additions and 1812 deletions

4
.gitignore vendored
View file

@ -1,2 +1,2 @@
uhd-*.tar.gz
uhd-images_*-release.tar.xz
/uhd-*.tar.gz
/uhd-images_*.tar.xz

View file

@ -1,2 +1,2 @@
SHA512 (uhd-images_003.010.003.000-release.tar.xz) = 49ee14093d356494af228b0ad55b7e61d176091341988f4de986e00dd3b23d8ab941365731f0af816c96099cc858229b2919b1d2f818bd59ce6ceaaf1970a876
SHA512 (uhd-release_003_010_003_000.tar.gz) = 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
SHA512 (uhd-4.10.0.0.tar.gz) = 600b6c8b1d5e37643e086d00e3c594b6b83a467b097576625dd4a949b3aab81cbbc221f2649a639fef67dfc0dce3bb919abee3cfb6ca266ad547262a16cdbd0e
SHA512 (uhd-images_4.10.0.0.tar.xz) = c5e54f47361a71baa3b5450fd4a3970a03349ecd69837a5de03a63f42b977f1e7e7246c0645d7178feac31f0c071e1914b3d8fcd60f8031aef4cfa45539d5054

View file

@ -1,23 +0,0 @@
diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp
index 839ed77..1fca880 100644
--- a/host/lib/usrp/common/max287x.hpp
+++ b/host/lib/usrp/common/max287x.hpp
@@ -30,6 +30,7 @@
#include <boost/math/special_functions/round.hpp>
#include <stdint.h>
#include <vector>
+#include <string>
#include "max2870_regs.hpp"
#include "max2871_regs.hpp"
@@ -642,8 +643,8 @@ double max287x<max287x_regs_t>::set_frequency(
<< boost::format("MAX287x: Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f"
) % ref_freq % double(RFdiv*2) % double(N + double(FRAC)/double(MOD)) << std::endl
<< boost::format("MAX287x: tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, type=%s"
- ) % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? "Integer-N" : "Fractional") << std::endl
- << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f"
+ ) % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? std::string("Integer-N") : std::string("Fractional"))
+ << std::endl << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f"
) % (target_freq/1e6) % (actual_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) << std::endl;
//load the register values

File diff suppressed because it is too large Load diff

450
uhd.spec
View file

@ -1,21 +1,25 @@
#%%global git_commit c52f3f41806622c95573de21be042f966f675543
#%%global git_date 201904023
#%%global git_short_commit %%(echo %{git_commit} | cut -c -8)
#%%global git_suffix %%{git_date}git%{git_short_commit}
# By default include binary_firmware, otherwise try to rebuild
# the firmware from sources. If you want to rebuild all firmware
# images you need to install appropriate tools (e.g. Xilinx ISE).
%bcond_without binary_firmware
# Currently broken: https://github.com/EttusResearch/uhd/issues/413
%bcond_with wireshark
# NEON support is by default disabled on ARMs
# building with --with=neon will enable auto detection
%bcond_with neon
%global ver_1 3
%global ver_2 10
%global ver_3 3
%global ver_4 0
%global ver %(printf "%03d.%03d.%03d.%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4})
%global ver_ %(printf "%03d_%03d_%03d_%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4})
%global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"')
# X.Y.Z
%global wireshark_ver_full %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"')
# X.Y
%global wireshark_ver %(VF="%{wireshark_ver_full}"; echo ${VF%.*})
%ifarch %{arm} aarch64
%if ! %{with neon}
@ -24,28 +28,48 @@
%endif
Name: uhd
URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki
Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4}
Release: 2%{?dist}
License: GPLv3+
URL: http://github.com/EttusResearch/uhd
Version: 4.10.0.0
#%%global images_ver %%{version}
%global images_ver 4.10.0.0
Release: 4%{?dist}
# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel
BuildRequires: docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel
BuildRequires: python-mako
%if ! %{with binary_firmware}
BuildRequires: sdcc sed
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
BuildRequires: libgcrypt-devel
BuildRequires: gnutls-devel
%endif
Requires(pre): shadow-utils
Requires: tkinter
Group: Applications/Engineering
BuildRequires: pybind11-devel
BuildRequires: python3-mako
BuildRequires: python3-requests
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: tar
%if ! %{with binary_firmware}
BuildRequires: sdcc
BuildRequires: sed
%endif
Requires(pre): glibc-common
Requires: python3-tkinter
Summary: Universal Hardware Driver for Ettus Research products
Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz
Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz
Source1: %{name}-limits.conf
Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.xz
# Fix firmware build with sdcc-3
Patch0: uhd-3.4.2-sdcc-3-fix.patch
# Workaround for building with gcc-8 (rhbz#1542187)
Patch1: uhd-3.1.3.0-boost-gcc8-compile-fix.patch
Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz
%description
The UHD is the universal hardware driver for Ettus Research products.
@ -67,9 +91,9 @@ Requires: %{name} = %{version}-%{release}
%description devel
Development files for the Universal Hardware Driver (UHD).
# arch due to bug in doxygen
%package doc
Summary: Documentation files for UHD
BuildArch: noarch
%description doc
Documentation for the Universal Hardware Driver (UHD).
@ -77,24 +101,41 @@ Documentation for the Universal Hardware Driver (UHD).
%package tools
Summary: Tools for working with / debugging USRP device
Requires: %{name} = %{version}-%{release}
#Requires: wireshark = %{wireshark_ver}
%description tools
Tools that are useful for working with and/or debugging USRP device.
%if %{with wireshark}
%package wireshark
Summary: Wireshark dissector plugins
Requires: %{name} = %{version}-%{release}
Requires: %{_libdir}/wireshark/plugins/%{wireshark_ver}
%description wireshark
Wireshark dissector plugins.
%endif
%prep
%setup -q -n uhd-release_%{ver_}
%patch0 -p1 -b .sdcc-3-fix
%patch1 -p1 -b .boost-gcc8-compile-fix
%autosetup -p1
# firmware
%if %{with binary_firmware}
# extract binary firmware
mkdir -p images/images
tar -xJf %{SOURCE2} -C images/images --strip-components=4
tar -xJf %{SOURCE2} -C images/images --strip-components=1
rm -f images/images/{LICENSE.txt,*.tag}
# remove Windows drivers
rm -rf images/winusb_driver
%endif
# fix python shebangs
find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \;
# Create a sysusers.d config file
cat >uhd.sysusers.conf <<EOF
g usrp -
EOF
%build
# firmware
%if ! %{with binary_firmware}
@ -106,36 +147,40 @@ make %{?_smp_mflags} images
popd
%endif
mkdir -p host/build
pushd host/build
%cmake %{?have_neon} ../
make %{?_smp_mflags}
pushd host
# DLIB_SUFFIX workaround for cmake 4.0
# https://github.com/EttusResearch/uhd/issues/844
%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \
-DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \
-DUHD_VERSION="%{version}" \
-DENABLE_TESTS=off ../ \
%if "%{?_lib}"=="lib64"
-DLIB_SUFFIX=64
%endif
%cmake_build
popd
# tools
pushd tools/uhd_dump
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}"
%if %{with wireshark}
# wireshark dissectors
pushd tools/dissectors
%cmake -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON
%cmake_build
popd
%endif
# tools wireshark plugin
# currenty disabled due to rhbz#1129419
#pushd tools/chdr-dissector
#mkdir build
#cd build
#%%cmake ../
#make %{?_smp_mflags}
#popd
%check
cd host/build
make test
#%%check
#cd host/%%{_vpath_builddir}
#%%ctest
%install
pushd host/build
make install DESTDIR=%{buildroot}
# fix python shebangs (run again for generated scripts)
find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \;
pushd host
%cmake_install
# Fix udev rules and use dynamic ACL management for device
sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
@ -162,36 +207,53 @@ rm -rf %{buildroot}%{_datadir}/uhd/images/winusb_driver
# convert hardlinks to symlinks (to not package the file twice)
pushd %{buildroot}%{_bindir}
for f in usrp_n2xx_simple_net_burner usrp_x3xx_fpga_burner;
for f in uhd_images_downloader usrp2_card_burner
do
unlink $f
ln -s ../..%{_libexecdir}/uhd/$f
ln -s ../..%{_libexecdir}/uhd/${f}.py $f
done
popd
# tools
install -Dpm 0755 tools/usrp_x3xx_fpga_jtag_programmer.sh %{buildroot}%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh
install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log
%post -p /sbin/ldconfig
%if %{with wireshark}
# wireshark dissectors
pushd tools/dissectors
%cmake_install
popd
# fix wireshark dissectors location
mkdir -p %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver}
mv %{buildroot}%{_prefix}/epan %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver}
%endif
# add directory for modules
mkdir -p %{buildroot}%{_libdir}/uhd/modules
install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf
%ldconfig_scriptlets
%postun -p /sbin/ldconfig
%files
%exclude %{_docdir}/%{name}/doxygen
%exclude %{_datadir}/uhd/images
%doc _tmpdoc/*
%dir %{_libdir}/uhd
%{_bindir}/usrpctl
%{_bindir}/uhd_*
%{_bindir}/usrp2*
%{_bindir}/usrp_n2xx_simple_net_burner
%{_bindir}/usrp_x3xx_fpga_burner
%{_bindir}/octoclock_firmware_burner
%{_bindir}/usrp2_*
%{_bindir}/usrp_hwd.py
%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
%{_libdir}/lib*.so.*
%{_libdir}/uhd/modules
%{_libexecdir}/uhd
%{_mandir}/man1/*.1*
%{_datadir}/uhd
%{python3_sitearch}/uhd
%{python3_sitearch}/usrp_mpm
%{_sysusersdir}/uhd.conf
%files firmware
%dir %{_datadir}/uhd/images
@ -209,9 +271,267 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log
%files tools
%doc tools/README.md
%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh
%{_bindir}/chdr_log
%if %{with wireshark}
%files wireshark
%{_libdir}/wireshark/plugins/%{wireshark_ver}/epan/*
%endif
%changelog
* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 4.10.0.0-4
- Rebuilt for Python 3.15.0b4 ABI change
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 4.10.0.0-2
- Rebuilt for Python 3.15
* Tue Apr 28 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 4.10.0.0-1
- New version
Resolves: rhbz#2451594
* Tue Jan 20 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Jan 12 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 4.9.0.1-2
- Rebuilt for Boost 1.90
* Mon Oct 13 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.9.0.1-2
- New version
Resolves: rhbz#2403533
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.9.0.0-2
- Rebuilt for Python 3.14.0rc3 bytecode
* Thu Sep 11 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.9.0.0-1
- New version
Resolves: rhbz#2387862
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.8.0.0-4
- Rebuilt for Python 3.14.0rc2 bytecode
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 4.8.0.0-2
- Rebuilt for Python 3.14
* Wed Mar 12 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.8.0.0-1
- New version
Resolves: rhbz#2337610
Resolves: rhbz#2341478
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.0.0-5
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 4.7.0.0-3
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jul 15 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 4.7.0.0-1
- New version
Resolves: rhbz#2293732
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 4.6.0.0-4
- Rebuilt for Python 3.13
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 4.6.0.0-2
- Rebuilt for Boost 1.83
* Tue Nov 21 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.6.0.0-1
- New version
Resolves: rhbz#2247579
* Mon Sep 25 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5.0.0-1
- New version
Resolves: rhbz#2237074
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 4.4.0.0-3
- Rebuilt for Python 3.12
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 4.4.0.0-2
- Rebuilt for Boost 1.81
* Wed Feb 1 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.4.0.0-1
- New version
Resolves: rhbz#2164284
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Sep 24 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.3.0.0-1
- New version
Resolves: rhbz#2124734
* Fri Jul 29 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.1-1
- New version
Resolves: rhbz#2110023
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.0-3
- Rebuilt for new python
Resolves: rhbz#2099182
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 4.2.0.0-2
- Rebuilt for Boost 1.78
* Thu Apr 21 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.0-1
- New version
Resolves: rhbz#2073640
* Tue Feb 1 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-5
- Switched to the upstream patch to fix compilation on the s390x
* Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-4
- Fixed images path
* Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-3
- Defuzzified s390x patch
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Dec 15 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-1
- New version
Resolves: rhbz#2029036
* Mon Oct 4 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.4-1
- New version
Resolves: rhbz#2006293
* Mon Sep 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.2-1
- New version
Resolves: rhbz#1989976
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 4.1.0.1-3
- Rebuilt for Boost 1.76
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jul 14 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.1-1
- New version
Resolves: rhbz#1982075
* 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
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 4.0.0.0-3
- Rebuilt for removed libstdc++ symbol (#1937698)
* Mon Feb 8 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0.0-2
- Fixed requires for wireshark plugin
Resolves: rhbz#1925577
* Mon Jan 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0.0-1
- New version
Resolves: rhbz#1918161
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 3.15.0.0-0.10.rc2
- Rebuilt for Boost 1.75
* Fri Dec 4 2020 Jeff Law <law@redhat.com> - 3.15.0.0-0.9.rc2
- Fix missing #includes for gcc-11
* Wed Aug 5 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 3.15.0.0-0.8.rc2
- Fixed FTBFS
Resolves: rhbz#1865590
- Made doc arch due to bug in doxygen
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.15.0.0-0.7.rc2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.15.0.0-0.6.rc2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 03 2020 Jonathan Wakely <jwakely@redhat.com> - 3.15.0.0-0.5.rc2
- Rebuilt and patched for Boost 1.73
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.0.0-0.4.rc2
- Rebuilt for Python 3.9
* Thu Apr 16 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 3.15.0.0-0.3.rc2
- Provided uhd modules directory
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.15.0.0-0.2.rc2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Nov 8 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.15.0.0-0.1.rc2
- New version
- Switched to Python 3
Resolves: rhbz#1738157
* Fri Aug 2 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.1.0-1
- New version
- Disabled tests
Resolves: rhbz#1736932
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.0.0-3.201904023gitc52f3f41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Apr 23 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.0.0-2.201904023gitc52f3f41
- New git snapshot
- Added python2-numpy build requirement
- Re-enabled tests for upstream to easily reproduce the problem
* Mon Apr 15 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.0.0-1.20190401gitac96d055
- New version, switched to git snapshot
- Conditionalized wireshark support
- Disabled wireshark support, it's currently broken (upstream ticket #268)
- Disabled tests, it's currently broken (upstream ticket #267)
- Dropped boost169 patch (not needed)
* Mon Apr 1 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.12.0.0-5
- Re-introduced usrp group
Resolves: rhbz#1694665
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 29 2019 Jonathan Wakely <jwakely@redhat.com> - 3.12.0.0-3
- Add upstream patches for Boost 1.69.0 header changes
* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 3.12.0.0-3
- Rebuilt for Boost 1.69
* Mon Dec 10 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 3.12.0.0-2
- Rebuilt for new gnuradio
Resolves: rhbz#1625012
- Fixed python shebangs
* Fri Jul 20 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 3.12.0.0-1
- New version
Resolves: rhbz#1606606
- Dropped sdcc-3-fix patch (upstreamed)
- Dropped boost-gcc8-compile-fix patch (not needed)
- Packaged wireshark dissectors
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.10.3.0-3
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.10.3.0-2
- Escape macros in %%changelog