From 9c809bc9da921cb350b2dacb2f3f319b396ad519 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 12 Nov 2019 08:33:06 -0600 Subject: [PATCH 01/75] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 79545f358593c4fe7a515cdeee1f301247bd9407 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:30:22 +0000 Subject: [PATCH 02/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 32c36bd..9070bfa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.1.rc2%{?dist} +Release: 0.2.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -261,6 +261,9 @@ exit 0 %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.15.0.0-0.2.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 8 2019 Jaroslav Škarvada - 3.15.0.0-0.1.rc2 - New version - Switched to Python 3 From dc44499c2a30c85fe43b02fafbfe28a70ca8269d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 17 Apr 2020 00:43:05 +0200 Subject: [PATCH 03/75] Provided uhd modules directory --- uhd.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 9070bfa..2358b39 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.2.rc2%{?dist} +Release: 0.3.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -216,6 +216,9 @@ popd mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %endif +# add directory for modules +mkdir -p %{buildroot}%{_libdir}/uhd/modules + %ldconfig_scriptlets %pre @@ -227,11 +230,13 @@ exit 0 %exclude %{_docdir}/%{name}/doxygen %exclude %{_datadir}/uhd/images %doc _tmpdoc/* +%dir %{_libdir}/uhd %{_bindir}/uhd_* %{_bindir}/usrp2_* %{_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 @@ -261,6 +266,9 @@ exit 0 %endif %changelog +* Thu Apr 16 2020 Jaroslav Škarvada - 3.15.0.0-0.3.rc2 +- Provided uhd modules directory + * Fri Jan 31 2020 Fedora Release Engineering - 3.15.0.0-0.2.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 562e4f234e3972d5df1dd212694868824162f80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:53:57 +0200 Subject: [PATCH 04/75] Rebuilt for Python 3.9 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2358b39..97240d5 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.3.rc2%{?dist} +Release: 0.4.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -266,6 +266,9 @@ exit 0 %endif %changelog +* Tue May 26 2020 Miro Hrončok - 3.15.0.0-0.4.rc2 +- Rebuilt for Python 3.9 + * Thu Apr 16 2020 Jaroslav Škarvada - 3.15.0.0-0.3.rc2 - Provided uhd modules directory From 745534ebabc68ae009475424e8bcee0fc5f0317a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 3 Jun 2020 13:02:16 +0100 Subject: [PATCH 05/75] Rebuilt and patched for Boost 1.73 --- uhd-bind-placeholders.patch | 182 ++++++++++++++++++++++++++++++++++++ uhd.spec | 7 +- 2 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 uhd-bind-placeholders.patch diff --git a/uhd-bind-placeholders.patch b/uhd-bind-placeholders.patch new file mode 100644 index 0000000..980f03e --- /dev/null +++ b/uhd-bind-placeholders.patch @@ -0,0 +1,182 @@ +--- uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake~ 2020-06-03 14:17:53.758142936 +0100 ++++ uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake 2020-06-03 14:17:55.821143050 +0100 +@@ -260,6 +260,9 @@ + # works for Boost 1.67.0 and newer & doesn't hurt older + add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) + ++ # Needed for Boost 1.73.0 to prevent warnings ++ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) ++ + # Boost 1.70.0's find cmake scripts don't always set the expected + # return variables. Replicate the commit that fixes that issue here: + # https://github.com/boostorg/boost_install/commit/cfa8d55250dfc2635e907e42da423e4eb540dee5 +--- uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp~ 2020-06-03 14:27:43.441170397 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 2020-06-03 14:27:48.015170596 +0100 +@@ -17,6 +17,7 @@ + + using namespace uhd; + using namespace uhd::rfnoc; ++using namespace boost::placeholders; + + class dma_fifo_block_ctrl_impl : public dma_fifo_block_ctrl + { +--- uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp~ 2020-06-03 14:28:32.297172502 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp 2020-06-03 14:28:40.874172872 +0100 +@@ -31,6 +31,7 @@ + + using namespace uhd; + using namespace uhd::usrp; ++using namespace boost::placeholders; + + const size_t multi_usrp::ALL_MBOARDS = size_t(~0); + const size_t multi_usrp::ALL_CHANS = size_t(~0); +--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp~ 2020-06-03 14:31:35.175180398 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp 2020-06-03 14:31:42.021180693 +0100 +@@ -37,6 +37,7 @@ + } + + using namespace uhd; ++using namespace boost::placeholders; + + const double rx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; + const double rx_dsp_core_3000::DEFAULT_RATE = 1e6; +--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp~ 2020-06-03 14:32:19.984182329 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp 2020-06-03 14:32:25.278182557 +0100 +@@ -28,6 +28,7 @@ + } + + using namespace uhd; ++using namespace boost::placeholders; + + const double tx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; + const double tx_dsp_core_3000::DEFAULT_RATE = 1e6; +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp~ 2020-06-03 14:33:42.513185887 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp 2020-06-03 14:33:44.167185959 +0100 +@@ -12,6 +12,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * Structors +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp~ 2020-06-03 14:34:31.865188014 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp 2020-06-03 14:34:38.007188279 +0100 +@@ -65,6 +65,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The TVRX2 types +--- uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp~ 2020-06-03 14:35:57.858191722 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 2020-06-03 14:36:02.680191929 +0100 +@@ -27,6 +27,7 @@ + using namespace uhd::usrp; + using namespace uhd::rfnoc; + using namespace uhd::usrp::x300; ++using namespace boost::placeholders; + + static const size_t IO_MASTER_RADIO = 0; + +--- uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp~ 2020-06-03 14:36:19.706192663 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp 2020-06-03 14:36:25.680192921 +0100 +@@ -23,6 +23,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace uhd::transport; ++using namespace boost::placeholders; + + namespace { + constexpr uint16_t B100_VENDOR_ID = 0x2500; +--- uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp~ 2020-06-03 14:36:54.427194160 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 2020-06-03 14:37:11.471194895 +0100 +@@ -34,6 +34,7 @@ + using namespace uhd; + using namespace uhd::usrp_clock; + using namespace uhd::transport; ++using namespace boost::placeholders; + namespace asio = boost::asio; + namespace fs = boost::filesystem; + +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp~ 2020-06-03 14:40:42.223206781 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp 2020-06-03 14:40:49.140207195 +0100 +@@ -13,6 +13,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * Structors +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp~ 2020-06-03 14:41:03.583208062 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp 2020-06-03 14:41:12.806208613 +0100 +@@ -26,6 +26,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The DBSRX2 constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp~ 2020-06-03 14:41:26.807209454 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp 2020-06-03 14:41:38.846210175 +0100 +@@ -41,6 +41,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The tvrx constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp~ 2020-06-03 14:41:50.031210845 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp 2020-06-03 14:41:55.988211201 +0100 +@@ -31,6 +31,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The DBSRX constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp~ 2020-06-03 15:03:03.828285516 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp 2020-06-03 15:03:06.925285692 +0100 +@@ -10,6 +10,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + + /*********************************************************************** +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp~ 2020-06-03 15:03:37.135287400 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp 2020-06-03 15:03:46.203287915 +0100 +@@ -58,6 +58,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The XCVR 2450 constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp~ 2020-06-03 15:04:13.982289481 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp 2020-06-03 15:04:21.595289912 +0100 +@@ -13,6 +13,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * Structors +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp~ 2020-06-03 15:20:39.628345132 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp 2020-06-03 15:20:48.073345609 +0100 +@@ -30,6 +30,7 @@ + + using namespace uhd; + using namespace uhd::usrp; ++using namespace boost::placeholders; + + /*********************************************************************** + * UBX Data Structures diff --git a/uhd.spec b/uhd.spec index 97240d5..b7adac6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.4.rc2%{?dist} +Release: 0.5.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -53,6 +53,7 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz +Patch0: %{name}-bind-placeholders.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -100,6 +101,7 @@ Wireshark dissector plugins. %prep %setup -q -n %{name}-%{ver}-rc2 +%patch0 -p1 # firmware %if %{with binary_firmware} @@ -266,6 +268,9 @@ exit 0 %endif %changelog +* Wed Jun 03 2020 Jonathan Wakely - 3.15.0.0-0.5.rc2 +- Rebuilt and patched for Boost 1.73 + * Tue May 26 2020 Miro Hrončok - 3.15.0.0-0.4.rc2 - Rebuilt for Python 3.9 From d6be796032f389e75ba17ddc662c0ab02252cfd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:13:12 +0000 Subject: [PATCH 06/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b7adac6..fdbecce 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.5.rc2%{?dist} +Release: 0.6.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -268,6 +268,9 @@ exit 0 %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.15.0.0-0.6.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 03 2020 Jonathan Wakely - 3.15.0.0-0.5.rc2 - Rebuilt and patched for Boost 1.73 From a7d22bb7bcffa6bd96c8fa5b299501d90091ee1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:32:20 +0000 Subject: [PATCH 07/75] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index fdbecce..09ea453 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.6.rc2%{?dist} +Release: 0.7.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -268,6 +268,10 @@ exit 0 %endif %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 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 - 3.15.0.0-0.6.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ea7ad13ad3491688c096765d9040859be716c4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Aug 2020 13:16:04 +0200 Subject: [PATCH 08/75] Fixed FTBFS Resolves: rhbz#1865590 --- uhd.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/uhd.spec b/uhd.spec index 09ea453..e304d3d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.7.rc2%{?dist} +Release: 0.8.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -127,13 +127,11 @@ make %{?_smp_mflags} images popd %endif -mkdir -p host/build -pushd host/build +pushd host %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \ -DUHD_VERSION="%{version}" \ -DENABLE_TESTS=off ../ -make %{?_smp_mflags} -#make -j1 +%cmake_build popd # tools @@ -148,8 +146,8 @@ for d in %{wireshark_dissectors} do mkdir "build_$d" pushd "build_$d" - %cmake -DETTUS_DISSECTOR_NAME="$d" ../ - make %{?_smp_mflags} + %cmake -DETTUS_DISSECTOR_NAME="$d" -S ".." + %cmake_build popd done popd @@ -163,8 +161,8 @@ popd # fix python shebangs (run again for generated scripts) find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \; -pushd host/build -make install DESTDIR=%{buildroot} +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"/GROUP:="usrp" MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules @@ -208,9 +206,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -for d in %{wireshark_dissectors} +for d in build_*/* do - pushd "build_$d" + pushd "$d" %make_install popd done @@ -268,6 +266,10 @@ exit 0 %endif %changelog +* Wed Aug 5 2020 Jaroslav Škarvada - 3.15.0.0-0.8.rc2 +- Fixed FTBFS + Resolves: rhbz#1865590 + * Sat Aug 01 2020 Fedora Release Engineering - 3.15.0.0-0.7.rc2 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 11aa984027c7e23fa7b78254b98c8b35231db027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Aug 2020 14:27:54 +0200 Subject: [PATCH 09/75] Made doc arch due to bug in doxygen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e304d3d..917cda4 100644 --- a/uhd.spec +++ b/uhd.spec @@ -75,9 +75,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). @@ -269,6 +269,7 @@ exit 0 * Wed Aug 5 2020 Jaroslav Škarvada - 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 - 3.15.0.0-0.7.rc2 - Second attempt - Rebuilt for From 7bb3593a734efaea0f853d7376bab4a07213e221 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:35:23 +0000 Subject: [PATCH 10/75] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From c31974efbc066c5d82afc517facb2ca8a539c42b Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 4 Dec 2020 21:03:00 -0700 Subject: [PATCH 11/75] Fix missing #includes for gcc-11 --- uhd-gcc11.patch | 228 ++++++++++++++++++++++++++++++++++++++++++++++++ uhd.spec | 7 +- 2 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 uhd-gcc11.patch diff --git a/uhd-gcc11.patch b/uhd-gcc11.patch new file mode 100644 index 0000000..e880eb4 --- /dev/null +++ b/uhd-gcc11.patch @@ -0,0 +1,228 @@ +diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp +index 3356510..55a8981 100644 +--- a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e31x_radio_ctrl_impl.hpp" + #include "e31x_regs.hpp" + +diff --git a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp +index c48cabc..0771aa0 100644 +--- a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "e320_radio_ctrl_impl.hpp" + #include "e320_regs.hpp" + +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp +index d9cadc8..155a075 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e3xx_ad9361_iface.hpp" + #include + #include +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp +index 001cf5d..c13b7e8 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e3xx_constants.hpp" + #include "e3xx_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp +index 989b73b..587ef6d 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e3xx_radio_ctrl_impl.hpp" + #include "e3xx_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp +index 5b33b33..bd5aac1 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp +@@ -4,6 +4,9 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++#include ++ + #include "e3xx_constants.hpp" + #include "e3xx_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp +index d7d1b43..d1308d1 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "magnesium_ad9371_iface.hpp" + #include "magnesium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp +index 13cc52d..1bd71ae 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp +@@ -6,6 +6,7 @@ + + // The band plan + ++#include + #include "magnesium_constants.hpp" + #include "magnesium_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp +index 67b20f5..7963153 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "magnesium_gain_table.hpp" + #include "magnesium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp +index 679816a..26bf5fd 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "magnesium_constants.hpp" + #include "magnesium_cpld_ctrl.hpp" + #include "magnesium_radio_ctrl_impl.hpp" +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp +index b66bd2e..041d651 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "magnesium_constants.hpp" + #include "magnesium_gain_table.hpp" + #include "magnesium_radio_ctrl_impl.hpp" +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp +index 405d595..5d3964b 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "magnesium_radio_ctrl_impl.hpp" + #include "magnesium_constants.hpp" + #include "magnesium_gain_table.hpp" +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp +index 89db614..893741c 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "magnesium_constants.hpp" + #include "magnesium_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp +index ffa2061..eb3c1cf 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp +index 846a4ea..450c16c 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_cpld_ctrl.hpp" + #include "rhodium_constants.hpp" +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp +index d6dbbc5..40e4c9c 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp +@@ -4,6 +4,9 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp +index 356932b..8420756 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp +index 4058624..f81a855 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include diff --git a/uhd.spec b/uhd.spec index 917cda4..675b870 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.8.rc2%{?dist} +Release: 0.9.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -54,6 +54,7 @@ Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz Patch0: %{name}-bind-placeholders.patch +Patch1: %{name}-gcc11.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -102,6 +103,7 @@ Wireshark dissector plugins. %prep %setup -q -n %{name}-%{ver}-rc2 %patch0 -p1 +%patch1 -p1 # firmware %if %{with binary_firmware} @@ -266,6 +268,9 @@ exit 0 %endif %changelog +* Fri Dec 4 2020 Jeff Law - 3.15.0.0-0.9.rc2 +- Fix missing #includes for gcc-11 + * Wed Aug 5 2020 Jaroslav Škarvada - 3.15.0.0-0.8.rc2 - Fixed FTBFS Resolves: rhbz#1865590 From 96f2e1b8e197674724fa5680dbe5dac4f1d92fc8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:21:18 +0000 Subject: [PATCH 12/75] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- uhd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uhd.spec b/uhd.spec index 675b870..2ed1fe7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -34,6 +34,7 @@ URL: http://github.com/EttusResearch/uhd Version: %{ver} Release: 0.9.rc2%{?dist} License: GPLv3+ +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel From 653a3d51a1f6b557e57411519f2e2f9a153aa3a5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 20:53:53 +0000 Subject: [PATCH 13/75] Rebuilt for Boost 1.75 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2ed1fe7..2995c61 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.9.rc2%{?dist} +Release: 0.10.rc2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -269,6 +269,9 @@ exit 0 %endif %changelog +* Fri Jan 22 2021 Jonathan Wakely - 3.15.0.0-0.10.rc2 +- Rebuilt for Boost 1.75 + * Fri Dec 4 2020 Jeff Law - 3.15.0.0-0.9.rc2 - Fix missing #includes for gcc-11 From 9833c761acf27666490bf966555c690c7ed43b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 26 Jan 2021 00:54:58 +0100 Subject: [PATCH 14/75] New version Resolves: rhbz#1918161 --- sources | 4 +- uhd-bind-placeholders.patch | 182 ---------------------------- uhd-gcc11.patch | 228 ------------------------------------ uhd.spec | 35 +++--- 4 files changed, 17 insertions(+), 432 deletions(-) delete mode 100644 uhd-bind-placeholders.patch delete mode 100644 uhd-gcc11.patch diff --git a/sources b/sources index 6bf1f5e..388b62a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_3.14.1.1.tar.xz) = d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd -SHA512 (uhd-3.15.0.0-rc2.tar.gz) = e4054ac9e481e1ee97f9046f0c2b3053c4d346bbe8df01e6ae515a1d592ac5a41e847537f4e20ba105f52a5d6aa3a5b5a356faa8cb220873521cbdb3a8cd56fd +SHA512 (uhd-images_4.0.0.0.tar.xz) = 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f +SHA512 (uhd-4.0.0.0.tar.gz) = 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd diff --git a/uhd-bind-placeholders.patch b/uhd-bind-placeholders.patch deleted file mode 100644 index 980f03e..0000000 --- a/uhd-bind-placeholders.patch +++ /dev/null @@ -1,182 +0,0 @@ ---- uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake~ 2020-06-03 14:17:53.758142936 +0100 -+++ uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake 2020-06-03 14:17:55.821143050 +0100 -@@ -260,6 +260,9 @@ - # works for Boost 1.67.0 and newer & doesn't hurt older - add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) - -+ # Needed for Boost 1.73.0 to prevent warnings -+ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) -+ - # Boost 1.70.0's find cmake scripts don't always set the expected - # return variables. Replicate the commit that fixes that issue here: - # https://github.com/boostorg/boost_install/commit/cfa8d55250dfc2635e907e42da423e4eb540dee5 ---- uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp~ 2020-06-03 14:27:43.441170397 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 2020-06-03 14:27:48.015170596 +0100 -@@ -17,6 +17,7 @@ - - using namespace uhd; - using namespace uhd::rfnoc; -+using namespace boost::placeholders; - - class dma_fifo_block_ctrl_impl : public dma_fifo_block_ctrl - { ---- uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp~ 2020-06-03 14:28:32.297172502 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp 2020-06-03 14:28:40.874172872 +0100 -@@ -31,6 +31,7 @@ - - using namespace uhd; - using namespace uhd::usrp; -+using namespace boost::placeholders; - - const size_t multi_usrp::ALL_MBOARDS = size_t(~0); - const size_t multi_usrp::ALL_CHANS = size_t(~0); ---- uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp~ 2020-06-03 14:31:35.175180398 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp 2020-06-03 14:31:42.021180693 +0100 -@@ -37,6 +37,7 @@ - } - - using namespace uhd; -+using namespace boost::placeholders; - - const double rx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; - const double rx_dsp_core_3000::DEFAULT_RATE = 1e6; ---- uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp~ 2020-06-03 14:32:19.984182329 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp 2020-06-03 14:32:25.278182557 +0100 -@@ -28,6 +28,7 @@ - } - - using namespace uhd; -+using namespace boost::placeholders; - - const double tx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; - const double tx_dsp_core_3000::DEFAULT_RATE = 1e6; ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp~ 2020-06-03 14:33:42.513185887 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp 2020-06-03 14:33:44.167185959 +0100 -@@ -12,6 +12,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * Structors ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp~ 2020-06-03 14:34:31.865188014 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp 2020-06-03 14:34:38.007188279 +0100 -@@ -65,6 +65,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The TVRX2 types ---- uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp~ 2020-06-03 14:35:57.858191722 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 2020-06-03 14:36:02.680191929 +0100 -@@ -27,6 +27,7 @@ - using namespace uhd::usrp; - using namespace uhd::rfnoc; - using namespace uhd::usrp::x300; -+using namespace boost::placeholders; - - static const size_t IO_MASTER_RADIO = 0; - ---- uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp~ 2020-06-03 14:36:19.706192663 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp 2020-06-03 14:36:25.680192921 +0100 -@@ -23,6 +23,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace uhd::transport; -+using namespace boost::placeholders; - - namespace { - constexpr uint16_t B100_VENDOR_ID = 0x2500; ---- uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp~ 2020-06-03 14:36:54.427194160 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 2020-06-03 14:37:11.471194895 +0100 -@@ -34,6 +34,7 @@ - using namespace uhd; - using namespace uhd::usrp_clock; - using namespace uhd::transport; -+using namespace boost::placeholders; - namespace asio = boost::asio; - namespace fs = boost::filesystem; - ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp~ 2020-06-03 14:40:42.223206781 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp 2020-06-03 14:40:49.140207195 +0100 -@@ -13,6 +13,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * Structors ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp~ 2020-06-03 14:41:03.583208062 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp 2020-06-03 14:41:12.806208613 +0100 -@@ -26,6 +26,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The DBSRX2 constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp~ 2020-06-03 14:41:26.807209454 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp 2020-06-03 14:41:38.846210175 +0100 -@@ -41,6 +41,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The tvrx constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp~ 2020-06-03 14:41:50.031210845 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp 2020-06-03 14:41:55.988211201 +0100 -@@ -31,6 +31,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The DBSRX constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp~ 2020-06-03 15:03:03.828285516 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp 2020-06-03 15:03:06.925285692 +0100 -@@ -10,6 +10,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - - /*********************************************************************** ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp~ 2020-06-03 15:03:37.135287400 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp 2020-06-03 15:03:46.203287915 +0100 -@@ -58,6 +58,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The XCVR 2450 constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp~ 2020-06-03 15:04:13.982289481 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp 2020-06-03 15:04:21.595289912 +0100 -@@ -13,6 +13,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * Structors ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp~ 2020-06-03 15:20:39.628345132 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp 2020-06-03 15:20:48.073345609 +0100 -@@ -30,6 +30,7 @@ - - using namespace uhd; - using namespace uhd::usrp; -+using namespace boost::placeholders; - - /*********************************************************************** - * UBX Data Structures diff --git a/uhd-gcc11.patch b/uhd-gcc11.patch deleted file mode 100644 index e880eb4..0000000 --- a/uhd-gcc11.patch +++ /dev/null @@ -1,228 +0,0 @@ -diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp -index 3356510..55a8981 100644 ---- a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e31x_radio_ctrl_impl.hpp" - #include "e31x_regs.hpp" - -diff --git a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp -index c48cabc..0771aa0 100644 ---- a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "e320_radio_ctrl_impl.hpp" - #include "e320_regs.hpp" - -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp -index d9cadc8..155a075 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e3xx_ad9361_iface.hpp" - #include - #include -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp -index 001cf5d..c13b7e8 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e3xx_constants.hpp" - #include "e3xx_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp -index 989b73b..587ef6d 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e3xx_radio_ctrl_impl.hpp" - #include "e3xx_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp -index 5b33b33..bd5aac1 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp -@@ -4,6 +4,9 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+#include -+ - #include "e3xx_constants.hpp" - #include "e3xx_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp -index d7d1b43..d1308d1 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "magnesium_ad9371_iface.hpp" - #include "magnesium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp -index 13cc52d..1bd71ae 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp -@@ -6,6 +6,7 @@ - - // The band plan - -+#include - #include "magnesium_constants.hpp" - #include "magnesium_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp -index 67b20f5..7963153 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "magnesium_gain_table.hpp" - #include "magnesium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp -index 679816a..26bf5fd 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "magnesium_constants.hpp" - #include "magnesium_cpld_ctrl.hpp" - #include "magnesium_radio_ctrl_impl.hpp" -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp -index b66bd2e..041d651 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "magnesium_constants.hpp" - #include "magnesium_gain_table.hpp" - #include "magnesium_radio_ctrl_impl.hpp" -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp -index 405d595..5d3964b 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "magnesium_radio_ctrl_impl.hpp" - #include "magnesium_constants.hpp" - #include "magnesium_gain_table.hpp" -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp -index 89db614..893741c 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "magnesium_constants.hpp" - #include "magnesium_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp -index ffa2061..eb3c1cf 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp -index 846a4ea..450c16c 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_cpld_ctrl.hpp" - #include "rhodium_constants.hpp" -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp -index d6dbbc5..40e4c9c 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp -@@ -4,6 +4,9 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp -index 356932b..8420756 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp -index 4058624..f81a855 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include diff --git a/uhd.spec b/uhd.spec index 2995c61..391e127 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,9 +9,7 @@ # images you need to install appropriate tools (e.g. Xilinx ISE). %bcond_without binary_firmware -# By default do not build with wireshark support, it's currently -# broken (upstream ticket #268) -%bcond_with wireshark +%bcond_without wireshark # NEON support is by default disabled on ARMs # building with --with=neon will enable auto detection @@ -26,15 +24,12 @@ %endif %endif -%global ver 3.15.0.0 -%global verd 3.14.1.1 - Name: uhd URL: http://github.com/EttusResearch/uhd -Version: %{ver} -Release: 0.10.rc2%{?dist} +Version: 4.0.0.0 +Release: 1%{?dist} License: GPLv3+ -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel @@ -50,12 +45,9 @@ BuildRequires: sdcc sed Requires(pre): shadow-utils, glibc-common Requires: python3-tkinter Summary: Universal Hardware Driver for Ettus Research products -#Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz -Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz +Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf -Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz -Patch0: %{name}-bind-placeholders.patch -Patch1: %{name}-gcc11.patch +Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz %description The UHD is the universal hardware driver for Ettus Research products. @@ -102,9 +94,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q -n %{name}-%{ver}-rc2 -%patch0 -p1 -%patch1 -p1 +%setup -q # firmware %if %{with binary_firmware} @@ -156,9 +146,9 @@ done popd %endif -#%%check -#cd host/build -#make test +%check +cd host/build +make test %install # fix python shebangs (run again for generated scripts) @@ -236,6 +226,7 @@ exit 0 %dir %{_libdir}/uhd %{_bindir}/uhd_* %{_bindir}/usrp2_* +%{_bindir}/rfnoc_image_builder %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* @@ -269,6 +260,10 @@ exit 0 %endif %changelog +* Mon Jan 25 2021 Jaroslav Škarvada - 4.0.0.0-1 +- New version + Resolves: rhbz#1918161 + * Fri Jan 22 2021 Jonathan Wakely - 3.15.0.0-0.10.rc2 - Rebuilt for Boost 1.75 From 7e9476da6cfdf2e4cc8f3d9eae600360c578ce4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 26 Jan 2021 01:19:00 +0100 Subject: [PATCH 15/75] Added fix for gcc-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.0.0.0-gcc-11-fix.patch | 12 ++++++++++++ uhd.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 uhd-4.0.0.0-gcc-11-fix.patch diff --git a/uhd-4.0.0.0-gcc-11-fix.patch b/uhd-4.0.0.0-gcc-11-fix.patch new file mode 100644 index 0000000..74129dc --- /dev/null +++ b/uhd-4.0.0.0-gcc-11-fix.patch @@ -0,0 +1,12 @@ +diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp +index e87a2ee..57744fe 100644 +--- a/host/lib/include/uhdlib/utils/rpc.hpp ++++ b/host/lib/include/uhdlib/utils/rpc.hpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + namespace { + diff --git a/uhd.spec b/uhd.spec index 391e127..b2cd6b7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -48,6 +48,7 @@ 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 +Patch0: uhd-4.0.0.0-gcc-11-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -95,6 +96,7 @@ Wireshark dissector plugins. %prep %setup -q +%patch0 -p1 -b .gcc-11-fix # firmware %if %{with binary_firmware} From b8f61d0e94b14aed2a92157515bf3d5a240a987e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Feb 2021 21:01:45 +0100 Subject: [PATCH 16/75] FTBFS fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.0.0.0-gcc-11-fix.patch | 17 ++++++++++++---- uhd.spec | 39 +++++++++++++++--------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/uhd-4.0.0.0-gcc-11-fix.patch b/uhd-4.0.0.0-gcc-11-fix.patch index 74129dc..629815c 100644 --- a/uhd-4.0.0.0-gcc-11-fix.patch +++ b/uhd-4.0.0.0-gcc-11-fix.patch @@ -1,12 +1,21 @@ +commit ae3d7551ded10ac51a3c2eda1e9e8ac64c4cd83b (HEAD -> fix-missing-includes-rpc, origin/fix-missing-includes-rpc) +Author: Martin Braun +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 e87a2ee..57744fe 100644 +index e87a2ee32..ca89c1054 100644 --- a/host/lib/include/uhdlib/utils/rpc.hpp +++ b/host/lib/include/uhdlib/utils/rpc.hpp -@@ -13,6 +13,7 @@ +@@ -12,7 +12,11 @@ + #include #include #include - #include +#include + #include ++#include ++#include ++#include namespace { - diff --git a/uhd.spec b/uhd.spec index b2cd6b7..248b924 100644 --- a/uhd.spec +++ b/uhd.spec @@ -15,8 +15,10 @@ # building with --with=neon will enable auto detection %bcond_with neon -%global wireshark_dissectors chdr zpu octoclock -%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} @@ -36,7 +38,7 @@ BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel BuildRequires: python3-docutils, doxygen, pkgconfig, libpcap-devel BuildRequires: python3-numpy, vim-common %if %{with wireshark} -BuildRequires: wireshark-devel +BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel %endif BuildRequires: python3-mako, python3-requests, python3-devel, tar %if ! %{with binary_firmware} @@ -88,7 +90,7 @@ Tools that are useful for working with and/or debugging USRP device. %package wireshark Summary: Wireshark dissector plugins Requires: %{name} = %{version}-%{release} -Requires: wireshark = %{wireshark_ver} +Requires: wireshark-cli%{?_isa} = %{wireshark_ver} %description wireshark Wireshark dissector plugins. @@ -137,20 +139,14 @@ popd %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -for d in %{wireshark_dissectors} -do - mkdir "build_$d" - pushd "build_$d" - %cmake -DETTUS_DISSECTOR_NAME="$d" -S ".." - %cmake_build - popd -done +%cmake -DENABLE_RFNOC=ON -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON +%cmake_build popd %endif -%check -cd host/build -make test +#%%check +#cd host/%%{_vpath_builddir} +#make test %install # fix python shebangs (run again for generated scripts) @@ -201,14 +197,11 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -for d in build_*/* -do - pushd "$d" - %make_install - popd -done +%cmake_install popd -mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark +# 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 @@ -258,7 +251,7 @@ exit 0 %if %{with wireshark} %files wireshark -%{_libdir}/wireshark/plugins/* +%{_libdir}/wireshark/plugins/%{wireshark_ver}/epan/* %endif %changelog From addbe90df666c59c91e82a48a4909344d06fbad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Feb 2021 22:15:28 +0100 Subject: [PATCH 17/75] Added workaround for s390x FTBFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.0.0.0-s390x-build-fix.patch | 10 ++++++++++ uhd.spec | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 uhd-4.0.0.0-s390x-build-fix.patch diff --git a/uhd-4.0.0.0-s390x-build-fix.patch b/uhd-4.0.0.0-s390x-build-fix.patch new file mode 100644 index 0000000..da7974d --- /dev/null +++ b/uhd-4.0.0.0-s390x-build-fix.patch @@ -0,0 +1,10 @@ +diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt +index 7e95d8c..2ad6e40 100644 +--- a/host/lib/utils/CMakeLists.txt ++++ b/host/lib/utils/CMakeLists.txt +@@ -229,3 +229,5 @@ if(ENABLE_C_API) + ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority_c.cpp + ) + endif(ENABLE_C_API) ++ ++LIBUHD_APPEND_LIBS(atomic) diff --git a/uhd.spec b/uhd.spec index 248b924..5b02776 100644 --- a/uhd.spec +++ b/uhd.spec @@ -36,7 +36,7 @@ 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 +BuildRequires: python3-numpy, vim-common, libatomic %if %{with wireshark} BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel %endif @@ -50,7 +50,10 @@ 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 %description The UHD is the universal hardware driver for Ettus Research products. @@ -99,6 +102,7 @@ Wireshark dissector plugins. %prep %setup -q %patch0 -p1 -b .gcc-11-fix +%patch1 -p1 -b .s390x-build-fix # firmware %if %{with binary_firmware} From d5dbfb93a199c79c33934ab171b7e0031663920e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 8 Feb 2021 12:27:53 +0100 Subject: [PATCH 18/75] Fixed requires for wireshark plugin Resolves: rhbz#1925577 --- uhd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index 5b02776..837cee6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.0.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -93,7 +93,7 @@ Tools that are useful for working with and/or debugging USRP device. %package wireshark Summary: Wireshark dissector plugins Requires: %{name} = %{version}-%{release} -Requires: wireshark-cli%{?_isa} = %{wireshark_ver} +Requires: %{_libdir}/wireshark/plugins/%{wireshark_ver} %description wireshark Wireshark dissector plugins. @@ -259,6 +259,10 @@ exit 0 %endif %changelog +* Mon Feb 8 2021 Jaroslav Škarvada - 4.0.0.0-2 +- Fixed requires for wireshark plugin + Resolves: rhbz#1925577 + * Mon Jan 25 2021 Jaroslav Škarvada - 4.0.0.0-1 - New version Resolves: rhbz#1918161 From 9accf032da61d217a35f11e61fc8f7a779693985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 8 Feb 2021 14:48:58 +0100 Subject: [PATCH 19/75] Fixed requires for wireshark plugin Resolves: rhbz#1925577 --- uhd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 837cee6..4c22025 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,7 +9,8 @@ # images you need to install appropriate tools (e.g. Xilinx ISE). %bcond_without binary_firmware -%bcond_without wireshark +# 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 From 53309a5cf125ed60357680097223e982517af689 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:36:21 +0100 Subject: [PATCH 20/75] Rebuilt for removed libstdc++ symbol (#1937698) --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 4c22025..aa35891 100644 --- a/uhd.spec +++ b/uhd.spec @@ -30,7 +30,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.0.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -260,6 +260,9 @@ exit 0 %endif %changelog +* Tue Mar 30 2021 Jonathan Wakely - 4.0.0.0-3 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Mon Feb 8 2021 Jaroslav Škarvada - 4.0.0.0-2 - Fixed requires for wireshark plugin Resolves: rhbz#1925577 From dff1e9b21922a15ea9d18cae969e6a27d162ab10 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Mon, 19 Apr 2021 13:18:32 +0200 Subject: [PATCH 21/75] BuildRequire setuptools explicitly See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index aa35891..4b2ebfb 100644 --- a/uhd.spec +++ b/uhd.spec @@ -41,7 +41,7 @@ BuildRequires: python3-numpy, vim-common, libatomic %if %{with wireshark} BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel %endif -BuildRequires: python3-mako, python3-requests, python3-devel, tar +BuildRequires: python3-mako, python3-requests, python3-devel, python3-setuptools, tar %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif From 58d4de4fcba38fad6e555136166d277b029b052b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:18:44 +0200 Subject: [PATCH 22/75] Rebuilt for Python 3.10 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 4b2ebfb..649b6db 100644 --- a/uhd.spec +++ b/uhd.spec @@ -30,7 +30,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.0.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -260,6 +260,9 @@ exit 0 %endif %changelog +* Fri Jun 04 2021 Python Maint - 4.0.0.0-4 +- Rebuilt for Python 3.10 + * Tue Mar 30 2021 Jonathan Wakely - 4.0.0.0-3 - Rebuilt for removed libstdc++ symbol (#1937698) From 06e22709bb1f1628571eb0b086f7c6ad9e417251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Jul 2021 19:26:00 +0200 Subject: [PATCH 23/75] New version Resolves: rhbz#1976430 --- sources | 4 ++-- uhd-4.0.0.0-gcc-11-fix.patch | 21 ------------------ uhd.spec | 43 +++++++++++++++++++++++++++--------- 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 uhd-4.0.0.0-gcc-11-fix.patch diff --git a/sources b/sources index 388b62a..9c0fbcf 100644 --- a/sources +++ b/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 diff --git a/uhd-4.0.0.0-gcc-11-fix.patch b/uhd-4.0.0.0-gcc-11-fix.patch deleted file mode 100644 index 629815c..0000000 --- a/uhd-4.0.0.0-gcc-11-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit ae3d7551ded10ac51a3c2eda1e9e8ac64c4cd83b (HEAD -> fix-missing-includes-rpc, origin/fix-missing-includes-rpc) -Author: Martin Braun -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 - #include - #include -+#include - #include -+#include -+#include -+#include - - namespace { diff --git a/uhd.spec b/uhd.spec index 649b6db..4d9206b 100644 --- a/uhd.spec +++ b/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 - 4.1.0.0-1 +- New version + Resolves: rhbz#1976430 + * Fri Jun 04 2021 Python Maint - 4.0.0.0-4 - Rebuilt for Python 3.10 From f35eda7fade87a6d812fd11595ab8fad390e14bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 14 Jul 2021 20:44:48 +0200 Subject: [PATCH 24/75] New version Resolves: rhbz#1982075 --- .gitignore | 4 ++-- sources | 2 +- uhd.spec | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cbdcc91..44d7193 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -uhd-*.tar.gz -uhd-images_*.tar.xz +/uhd-*.tar.gz +/uhd-images_*.tar.xz diff --git a/sources b/sources index 9c0fbcf..b8d5312 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.1.0.0.tar.gz) = b4d1510836d53ece449277749edb615ac8ba3be52853583e2e398994f7412151cbda513c4978e45e5bbf3642009d62bebdca9a615443ef9c8ff522ad4791b1ab SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 +SHA512 (uhd-4.1.0.1.tar.gz) = c31438cb6ef63e5913738474be5963e1732de3ffa6e864f6d6caf2218726912770f38f6d67872f882435da7d6841147c904c72545b88ae9e46c734c376697c4d diff --git a/uhd.spec b/uhd.spec index 4d9206b..e8ada57 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.0 +Version: 4.1.0.1 +#%%global images_ver %%{version} +%global images_ver 4.1.0.0 Release: 1%{?dist} License: GPLv3+ BuildRequires: make @@ -65,7 +67,7 @@ Requires: python3-tkinter 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 +Source2: %{url}/releases/download/v%{version}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 Patch1: uhd-4.0.0.0-s390x-build-fix.patch @@ -277,6 +279,10 @@ exit 0 %endif %changelog +* Wed Jul 14 2021 Jaroslav Škarvada - 4.1.0.1-1 +- New version + Resolves: rhbz#1982075 + * Thu Jul 1 2021 Jaroslav Škarvada - 4.1.0.0-1 - New version Resolves: rhbz#1976430 From f4c63bf9863e888ad945fd19af9e3404262ef7c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:58:22 +0000 Subject: [PATCH 25/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e8ada57..8218f67 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.1 #%%global images_ver %%{version} %global images_ver 4.1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 14 2021 Jaroslav Škarvada - 4.1.0.1-1 - New version Resolves: rhbz#1982075 From c279d53123a025797fd243d1ba54e9fad48f7cc0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 6 Aug 2021 23:55:47 +0100 Subject: [PATCH 26/75] Rebuilt for Boost 1.76 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 8218f67..f7a8e1d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.1 #%%global images_ver %%{version} %global images_ver 4.1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Fri Aug 06 2021 Jonathan Wakely - 4.1.0.1-3 +- Rebuilt for Boost 1.76 + * Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d7f5921e6e72f9d710d1da61f73b27ee9f9c3593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 13 Sep 2021 19:04:39 +0200 Subject: [PATCH 27/75] New version Resolves: rhbz#1989976 --- sources | 2 +- uhd.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index b8d5312..f3be55b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 -SHA512 (uhd-4.1.0.1.tar.gz) = c31438cb6ef63e5913738474be5963e1732de3ffa6e864f6d6caf2218726912770f38f6d67872f882435da7d6841147c904c72545b88ae9e46c734c376697c4d +SHA512 (uhd-4.1.0.2.tar.gz) = 7e10351511b1bb12ed7049ad5455948fb83f40e6c10a6beca8cb4fd75257a48328c1de1cc316219bef69c0cbd15aed861e8614987b2bf2b7ea25f17415251454 diff --git a/uhd.spec b/uhd.spec index f7a8e1d..dc742c2 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.1 +Version: 4.1.0.2 #%%global images_ver %%{version} %global images_ver 4.1.0.0 -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Sep 13 2021 Jaroslav Škarvada - 4.1.0.2-1 +- New version + Resolves: rhbz#1989976 + * Fri Aug 06 2021 Jonathan Wakely - 4.1.0.1-3 - Rebuilt for Boost 1.76 From 70d4bfb9a0068c26e1a8304ded29cc18710fca3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 4 Oct 2021 19:38:52 +0200 Subject: [PATCH 28/75] New version Resolves: rhbz#2006293 --- sources | 2 +- uhd.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index f3be55b..c053703 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 -SHA512 (uhd-4.1.0.2.tar.gz) = 7e10351511b1bb12ed7049ad5455948fb83f40e6c10a6beca8cb4fd75257a48328c1de1cc316219bef69c0cbd15aed861e8614987b2bf2b7ea25f17415251454 +SHA512 (uhd-4.1.0.4.tar.gz) = f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6 diff --git a/uhd.spec b/uhd.spec index dc742c2..a4cb66c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.2 +Version: 4.1.0.4 #%%global images_ver %%{version} %global images_ver 4.1.0.0 Release: 1%{?dist} @@ -67,7 +67,7 @@ Requires: python3-tkinter 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_%{images_ver}.tar.xz +Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 Patch1: uhd-4.0.0.0-s390x-build-fix.patch @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Oct 4 2021 Jaroslav Škarvada - 4.1.0.4-1 +- New version + Resolves: rhbz#2006293 + * Mon Sep 13 2021 Jaroslav Škarvada - 4.1.0.2-1 - New version Resolves: rhbz#1989976 From c14745893abde42a966b07dd49ab3d301f6e86fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 15 Dec 2021 22:29:50 +0100 Subject: [PATCH 29/75] New version Resolves: rhbz#2029036 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c053703..881fa60 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 -SHA512 (uhd-4.1.0.4.tar.gz) = f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6 +SHA512 (uhd-images_4.1.0.4.tar.xz) = 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b +SHA512 (uhd-4.1.0.5.tar.gz) = 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af diff --git a/uhd.spec b/uhd.spec index a4cb66c..69a5dc0 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.4 +Version: 4.1.0.5 #%%global images_ver %%{version} -%global images_ver 4.1.0.0 +%global images_ver 4.1.0.4 Release: 1%{?dist} License: GPLv3+ BuildRequires: make @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Wed Dec 15 2021 Jaroslav Škarvada - 4.1.0.5-1 +- New version + Resolves: rhbz#2029036 + * Mon Oct 4 2021 Jaroslav Škarvada - 4.1.0.4-1 - New version Resolves: rhbz#2006293 From 78789617741f08d0a1b7ffc3918c405601e23278 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:27:22 +0000 Subject: [PATCH 30/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 69a5dc0..6a3dd01 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Dec 15 2021 Jaroslav Škarvada - 4.1.0.5-1 - New version Resolves: rhbz#2029036 From 87d004a0af89fc8d52e0e9faa6261d1c14d1b449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 28 Jan 2022 16:41:50 +0100 Subject: [PATCH 31/75] Defuzzified s390x patch --- ...0x-build-fix.patch => uhd-4.1.0.5-s390x-build-fix.patch | 4 ++-- uhd.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) rename uhd-4.0.0.0-s390x-build-fix.patch => uhd-4.1.0.5-s390x-build-fix.patch (79%) diff --git a/uhd-4.0.0.0-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch similarity index 79% rename from uhd-4.0.0.0-s390x-build-fix.patch rename to uhd-4.1.0.5-s390x-build-fix.patch index da7974d..d4b1e45 100644 --- a/uhd-4.0.0.0-s390x-build-fix.patch +++ b/uhd-4.1.0.5-s390x-build-fix.patch @@ -1,8 +1,8 @@ diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt -index 7e95d8c..2ad6e40 100644 +index 639b3e9..abd4e0f 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt -@@ -229,3 +229,5 @@ if(ENABLE_C_API) +@@ -243,3 +243,5 @@ if(ENABLE_C_API) ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority_c.cpp ) endif(ENABLE_C_API) diff --git a/uhd.spec b/uhd.spec index 6a3dd01..f083d57 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -69,7 +69,7 @@ Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 -Patch1: uhd-4.0.0.0-s390x-build-fix.patch +Patch1: uhd-4.1.0.5-s390x-build-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-3 +- Defuzzified s390x patch + * Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 49229bd6ae6013a318497fb3c389652fa46c040f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 29 Jan 2022 00:40:07 +0100 Subject: [PATCH 32/75] Fixed images path --- uhd-4.1.0.5-imagepath-fix.patch | 13 +++++++++++++ uhd.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 uhd-4.1.0.5-imagepath-fix.patch diff --git a/uhd-4.1.0.5-imagepath-fix.patch b/uhd-4.1.0.5-imagepath-fix.patch new file mode 100644 index 0000000..847ff04 --- /dev/null +++ b/uhd-4.1.0.5-imagepath-fix.patch @@ -0,0 +1,13 @@ +diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp +index 802dd5e..e3bd722 100644 +--- a/host/lib/utils/paths.cpp ++++ b/host/lib/utils/paths.cpp +@@ -289,7 +289,7 @@ std::string uhd::get_pkg_path(void) + + std::string uhd::get_lib_path(void) + { +- fs::path runtime_libfile_path = boost::dll::this_line_location(); ++ fs::path runtime_libfile_path = "/usr" / boost::dll::this_line_location(); + //Normalize before decomposing path so result is reliable + fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path(); + return lib_path.string(); diff --git a/uhd.spec b/uhd.spec index f083d57..97f307f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -70,6 +70,9 @@ Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 Patch1: uhd-4.1.0.5-s390x-build-fix.patch +# dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 +# until the better fix is available +Patch2: uhd-4.1.0.5-imagepath-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -118,6 +121,7 @@ Wireshark dissector plugins. %prep %setup -q %patch1 -p1 -b .s390x-build-fix +%patch2 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} @@ -279,6 +283,9 @@ exit 0 %endif %changelog +* Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-4 +- Fixed images path + * Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-3 - Defuzzified s390x patch From 613bc2470d5d7d8474b48f8cb60200ae9e7e7bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 1 Feb 2022 01:06:00 +0100 Subject: [PATCH 33/75] Switched to the upstream patch to fix compilation on the s390x --- uhd-4.1.0.5-s390x-build-fix.patch | 54 +++++++++++++++++++++++++------ uhd.spec | 5 ++- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/uhd-4.1.0.5-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch index d4b1e45..b843d80 100644 --- a/uhd-4.1.0.5-s390x-build-fix.patch +++ b/uhd-4.1.0.5-s390x-build-fix.patch @@ -1,10 +1,46 @@ -diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt -index 639b3e9..abd4e0f 100644 ---- a/host/lib/utils/CMakeLists.txt -+++ b/host/lib/utils/CMakeLists.txt -@@ -243,3 +243,5 @@ if(ENABLE_C_API) - ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority_c.cpp - ) - endif(ENABLE_C_API) +diff --git a/host/cmake/Modules/UHDAtomics.cmake b/host/cmake/Modules/UHDAtomics.cmake +index 4d53a2d..e206f39 100644 +--- a/host/cmake/Modules/UHDAtomics.cmake ++++ b/host/cmake/Modules/UHDAtomics.cmake +@@ -33,6 +33,16 @@ function(CHECK_WORKING_CXX_ATOMICS64 varname) + " ${varname}) + endfunction(CHECK_WORKING_CXX_ATOMICS64) + ++function(CHECK_WORKING_CXX_BOOST_ATOMICS varname) ++ CHECK_CXX_SOURCE_COMPILES(" ++ #include ++ boost::lockfree::queue queue(1); ++ int main() { ++ return queue.is_lock_free(); ++ } ++ " ${varname}) ++endfunction(CHECK_WORKING_CXX_BOOST_ATOMICS) + -+LIBUHD_APPEND_LIBS(atomic) + macro(CHECK_ATOMICS_LIB_REQUIRED required_var) + set(${required_var} FALSE) + if(MSVC) +@@ -76,5 +86,24 @@ macro(CHECK_ATOMICS_LIB_REQUIRED required_var) + "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") + endif() + endif() ++ # Check whether boost requires atomic. ++ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) ++ # If not, check if the library exists, and atomics work with it. ++ if(NOT HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) ++ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) ++ if(HAVE_LIBATOMIC) ++ set(${required_var} TRUE) ++ set(CMAKE_REQUIRED_LIBRARIES "atomic") ++ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITH_LIB) ++ unset(CMAKE_REQUIRED_LIBRARIES) ++ if (NOT HAVE_CXX_BOOST_ATOMICS_WITH_LIB) ++ message(FATAL_ERROR "Host compiler must support std::atomic!") ++ endif() ++ else() ++ message( ++ FATAL_ERROR ++ "Host compiler appears to require libatomic, but cannot find it.") ++ endif() ++ endif() + endif() + endmacro(CHECK_ATOMICS_LIB_REQUIRED) diff --git a/uhd.spec b/uhd.spec index 97f307f..b68836c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -283,6 +283,9 @@ exit 0 %endif %changelog +* Tue Feb 1 2022 Jaroslav Škarvada - 4.1.0.5-5 +- Switched to the upstream patch to fix compilation on the s390x + * Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-4 - Fixed images path From 875ad9bdff2967d07b899385c4cf448a91438c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 21 Apr 2022 15:04:27 +0200 Subject: [PATCH 34/75] New version Resolves: rhbz#2073640 --- sources | 4 +- uhd-4.1.0.5-s390x-build-fix.patch | 46 ------------------- ...x.patch => uhd-4.2.0.0-imagepath-fix.patch | 6 +-- uhd.spec | 17 +++---- 4 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 uhd-4.1.0.5-s390x-build-fix.patch rename uhd-4.1.0.5-imagepath-fix.patch => uhd-4.2.0.0-imagepath-fix.patch (74%) diff --git a/sources b/sources index 881fa60..20ccc4b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.1.0.4.tar.xz) = 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b -SHA512 (uhd-4.1.0.5.tar.gz) = 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af +SHA512 (uhd-4.2.0.0.tar.gz) = a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c +SHA512 (uhd-images_4.1.0.5.tar.xz) = fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c diff --git a/uhd-4.1.0.5-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch deleted file mode 100644 index b843d80..0000000 --- a/uhd-4.1.0.5-s390x-build-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/host/cmake/Modules/UHDAtomics.cmake b/host/cmake/Modules/UHDAtomics.cmake -index 4d53a2d..e206f39 100644 ---- a/host/cmake/Modules/UHDAtomics.cmake -+++ b/host/cmake/Modules/UHDAtomics.cmake -@@ -33,6 +33,16 @@ function(CHECK_WORKING_CXX_ATOMICS64 varname) - " ${varname}) - endfunction(CHECK_WORKING_CXX_ATOMICS64) - -+function(CHECK_WORKING_CXX_BOOST_ATOMICS varname) -+ CHECK_CXX_SOURCE_COMPILES(" -+ #include -+ boost::lockfree::queue queue(1); -+ int main() { -+ return queue.is_lock_free(); -+ } -+ " ${varname}) -+endfunction(CHECK_WORKING_CXX_BOOST_ATOMICS) -+ - macro(CHECK_ATOMICS_LIB_REQUIRED required_var) - set(${required_var} FALSE) - if(MSVC) -@@ -76,5 +86,24 @@ macro(CHECK_ATOMICS_LIB_REQUIRED required_var) - "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") - endif() - endif() -+ # Check whether boost requires atomic. -+ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) -+ # If not, check if the library exists, and atomics work with it. -+ if(NOT HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) -+ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) -+ if(HAVE_LIBATOMIC) -+ set(${required_var} TRUE) -+ set(CMAKE_REQUIRED_LIBRARIES "atomic") -+ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITH_LIB) -+ unset(CMAKE_REQUIRED_LIBRARIES) -+ if (NOT HAVE_CXX_BOOST_ATOMICS_WITH_LIB) -+ message(FATAL_ERROR "Host compiler must support std::atomic!") -+ endif() -+ else() -+ message( -+ FATAL_ERROR -+ "Host compiler appears to require libatomic, but cannot find it.") -+ endif() -+ endif() - endif() - endmacro(CHECK_ATOMICS_LIB_REQUIRED) diff --git a/uhd-4.1.0.5-imagepath-fix.patch b/uhd-4.2.0.0-imagepath-fix.patch similarity index 74% rename from uhd-4.1.0.5-imagepath-fix.patch rename to uhd-4.2.0.0-imagepath-fix.patch index 847ff04..7230a92 100644 --- a/uhd-4.1.0.5-imagepath-fix.patch +++ b/uhd-4.2.0.0-imagepath-fix.patch @@ -1,13 +1,13 @@ diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 802dd5e..e3bd722 100644 +index 73b4cc2..a122c9d 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp -@@ -289,7 +289,7 @@ std::string uhd::get_pkg_path(void) +@@ -290,7 +290,7 @@ std::string uhd::get_pkg_path(void) std::string uhd::get_lib_path(void) { - fs::path runtime_libfile_path = boost::dll::this_line_location(); + fs::path runtime_libfile_path = "/usr" / boost::dll::this_line_location(); - //Normalize before decomposing path so result is reliable + // Normalize before decomposing path so result is reliable fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path(); return lib_path.string(); diff --git a/uhd.spec b/uhd.spec index b68836c..0a0938a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.5 +Version: 4.2.0.0 #%%global images_ver %%{version} -%global images_ver 4.1.0.4 -Release: 5%{?dist} +%global images_ver 4.1.0.5 +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -68,11 +68,9 @@ 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%{images_ver}/uhd-images_%{images_ver}.tar.xz -# https://github.com/EttusResearch/uhd/issues/410 -Patch1: uhd-4.1.0.5-s390x-build-fix.patch # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available -Patch2: uhd-4.1.0.5-imagepath-fix.patch +Patch0: uhd-4.2.0.0-imagepath-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -120,8 +118,7 @@ Wireshark dissector plugins. %prep %setup -q -%patch1 -p1 -b .s390x-build-fix -%patch2 -p1 -b .imagepath-fix +%patch0 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} @@ -283,6 +280,10 @@ exit 0 %endif %changelog +* Thu Apr 21 2022 Jaroslav Škarvada - 4.2.0.0-1 +- New version + Resolves: rhbz#2073640 + * Tue Feb 1 2022 Jaroslav Škarvada - 4.1.0.5-5 - Switched to the upstream patch to fix compilation on the s390x From 1bc8bc1e0f221e87829e27385ce4cae0d3e76c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 21 Apr 2022 21:32:44 +0200 Subject: [PATCH 35/75] Fixed FTBFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/uhd.spec b/uhd.spec index 0a0938a..c1e8faa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -239,6 +239,7 @@ exit 0 %exclude %{_datadir}/uhd/images %doc _tmpdoc/* %dir %{_libdir}/uhd +%{_bindir}/usrpctl %{_bindir}/uhd_* %{_bindir}/usrp2_* %{_bindir}/rfnoc_image_builder @@ -270,9 +271,6 @@ 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 From 4047fb8169b8e2521f55dfbd5135fdb7ea09a337 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:27 +0200 Subject: [PATCH 36/75] Rebuilt for Boost 1.78 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index c1e8faa..6f0115d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -278,6 +278,9 @@ exit 0 %endif %changelog +* Wed May 04 2022 Thomas Rodgers - 4.2.0.0-2 +- Rebuilt for Boost 1.78 + * Thu Apr 21 2022 Jaroslav Škarvada - 4.2.0.0-1 - New version Resolves: rhbz#2073640 From e5fb6d407069a870b581c2b89cd35685fcf74edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 20 Jun 2022 12:27:34 +0200 Subject: [PATCH 37/75] Rebuilt for new python Resolves: rhbz#2099182 --- uhd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6f0115d..2961a01 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -278,6 +278,10 @@ exit 0 %endif %changelog +* Mon Jun 20 2022 Jaroslav Škarvada - 4.2.0.0-3 +- Rebuilt for new python + Resolves: rhbz#2099182 + * Wed May 04 2022 Thomas Rodgers - 4.2.0.0-2 - Rebuilt for Boost 1.78 From f11fa01adb3bd845c6666acf1b95d829b47ae624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 21 Jun 2022 14:24:16 +0200 Subject: [PATCH 38/75] 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 --- uhd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uhd.spec b/uhd.spec index 2961a01..37f9458 100644 --- a/uhd.spec +++ b/uhd.spec @@ -53,6 +53,7 @@ BuildRequires: wireshark-devel BuildRequires: libgcrypt-devel BuildRequires: gnutls-devel %endif +BuildRequires: pybind11-devel BuildRequires: python3-mako BuildRequires: python3-requests BuildRequires: python3-devel @@ -146,6 +147,7 @@ popd pushd host %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \ + -DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \ -DUHD_VERSION="%{version}" \ -DENABLE_TESTS=off ../ %cmake_build From 8c8cb59a3387a732e7eff1faec8f5e79512a19b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:19:11 +0000 Subject: [PATCH 39/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 37f9458..34bf925 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -280,6 +280,9 @@ exit 0 %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Jaroslav Škarvada - 4.2.0.0-3 - Rebuilt for new python Resolves: rhbz#2099182 From b9d08a4ba6f5dc7b9e4e390c55529f6fcbe67ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 29 Jul 2022 23:30:17 +0200 Subject: [PATCH 40/75] New version Resolves: rhbz#2110023 --- sources | 4 ++-- uhd.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 20ccc4b..7e2ebbe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.2.0.0.tar.gz) = a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c -SHA512 (uhd-images_4.1.0.5.tar.xz) = fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c +SHA512 (uhd-4.2.0.1.tar.gz) = 9b5e1c706f937e433c3eebe32492bf7bc8d38e8f4bca231e0cd2b1b9996910203c6cc3ffea8c54467062e24f912ece3a476943c7d73500d7dc1a958cc67c4807 +SHA512 (uhd-images_4.2.0.1.tar.xz) = cb2c5465c1b4ad9e1192392b48740e0d2be07a9a7ce65adbe7d7850062b48a96a06fef9bb1350f6586054c5cf3354abb9dce66259e95391ec4494f3e1046b905 diff --git a/uhd.spec b/uhd.spec index 34bf925..2f71bee 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.2.0.0 +Version: 4.2.0.1 #%%global images_ver %%{version} -%global images_ver 4.1.0.5 -Release: 4%{?dist} +%global images_ver 4.2.0.1 +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -280,6 +280,10 @@ exit 0 %endif %changelog +* Fri Jul 29 2022 Jaroslav Škarvada - 4.2.0.1-1 +- New version + Resolves: rhbz#2110023 + * Sat Jul 23 2022 Fedora Release Engineering - 4.2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 435955a71853042b000600736c4b3c8cd6441325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 24 Sep 2022 18:17:23 +0200 Subject: [PATCH 41/75] New version Resolves: rhbz#2124734 --- sources | 4 ++-- uhd.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 7e2ebbe..cce63fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.2.0.1.tar.gz) = 9b5e1c706f937e433c3eebe32492bf7bc8d38e8f4bca231e0cd2b1b9996910203c6cc3ffea8c54467062e24f912ece3a476943c7d73500d7dc1a958cc67c4807 -SHA512 (uhd-images_4.2.0.1.tar.xz) = cb2c5465c1b4ad9e1192392b48740e0d2be07a9a7ce65adbe7d7850062b48a96a06fef9bb1350f6586054c5cf3354abb9dce66259e95391ec4494f3e1046b905 +SHA512 (uhd-4.3.0.0.tar.gz) = 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc +SHA512 (uhd-images_4.3.0.0.tar.xz) = 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7 diff --git a/uhd.spec b/uhd.spec index 2f71bee..457cf26 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,8 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.2.0.1 -#%%global images_ver %%{version} -%global images_ver 4.2.0.1 +Version: 4.3.0.0 +%global images_ver %{version} Release: 1%{?dist} License: GPLv3+ BuildRequires: make @@ -280,6 +279,10 @@ exit 0 %endif %changelog +* Sat Sep 24 2022 Jaroslav Škarvada - 4.3.0.0-1 +- New version + Resolves: rhbz#2124734 + * Fri Jul 29 2022 Jaroslav Škarvada - 4.2.0.1-1 - New version Resolves: rhbz#2110023 From def8e2df85df84f2dc10cdc639b6b4685c4575c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:44:28 +0000 Subject: [PATCH 42/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 457cf26..eed4bc9 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.3.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Sep 24 2022 Jaroslav Škarvada - 4.3.0.0-1 - New version Resolves: rhbz#2124734 From 1320ace55817e287804892f2a06f6b586de33df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 1 Feb 2023 17:39:19 +0100 Subject: [PATCH 43/75] New version Resolves: rhbz#2164284 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index cce63fb..d994e2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.3.0.0.tar.gz) = 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc -SHA512 (uhd-images_4.3.0.0.tar.xz) = 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7 +SHA512 (uhd-images_4.4.0.0.tar.xz) = 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 +SHA512 (uhd-4.4.0.0.tar.gz) = 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a diff --git a/uhd.spec b/uhd.spec index eed4bc9..0a7e15c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.3.0.0 +Version: 4.4.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Wed Feb 1 2023 Jaroslav Škarvada - 4.4.0.0-1 +- New version + Resolves: rhbz#2164284 + * Sat Jan 21 2023 Fedora Release Engineering - 4.3.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e6450ed1a05dd36d9a9033e07ab459aa64cd5831 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 21:57:26 +0000 Subject: [PATCH 44/75] Rebuilt for Boost 1.81 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 0a7e15c..de3310f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Mon Feb 20 2023 Jonathan Wakely - 4.4.0.0-2 +- Rebuilt for Boost 1.81 + * Wed Feb 1 2023 Jaroslav Škarvada - 4.4.0.0-1 - New version Resolves: rhbz#2164284 From bdf88f038a8fa8cf91d54da1487d079e42ee5312 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 19 May 2023 08:00:00 +0000 Subject: [PATCH 45/75] 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 --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index de3310f..b24324d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -177,7 +177,7 @@ 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"/GROUP:="usrp" 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 From 7ba9c549ea35c311c6ce9037143f1774ac0b471d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 20:24:03 +0200 Subject: [PATCH 46/75] Rebuilt for Python 3.12 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b24324d..f736999 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Wed Jun 14 2023 Python Maint - 4.4.0.0-3 +- Rebuilt for Python 3.12 + * Mon Feb 20 2023 Jonathan Wakely - 4.4.0.0-2 - Rebuilt for Boost 1.81 From f928391d8d225bfca65bdd8836a95637947dfba6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:02:35 +0000 Subject: [PATCH 47/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index f736999..021cfaa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.4.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 14 2023 Python Maint - 4.4.0.0-3 - Rebuilt for Python 3.12 From b3de8665ea6b7d7d5fe6140309ebd98d4920f428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Sep 2023 13:58:33 +0200 Subject: [PATCH 48/75] New version Resolves: rhbz#2237074 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index d994e2a..d146703 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.4.0.0.tar.xz) = 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 -SHA512 (uhd-4.4.0.0.tar.gz) = 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a +SHA512 (uhd-4.5.0.0.tar.gz) = 20ef6e2ee973476312a1b63e1121f98b9b2f7f471090a26e2492eb4e6ca476421e318294359144306e6663bdc2f4a86040e796707d8757cc83c62ec2a7207d77 +SHA512 (uhd-images_4.5.0.0.tar.xz) = b0b5fe02f59df574be97cb4a867da70a823bf0a3b80f9bcd88bf52248da4dccd48694e50a2d01e588de76c4857bb4cee725a7008776e2685a4d86429f50e7a41 diff --git a/uhd.spec b/uhd.spec index 021cfaa..5f891a8 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.4.0.0 +Version: 4.5.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Sep 25 2023 Jaroslav Škarvada - 4.5.0.0-1 +- New version + Resolves: rhbz#2237074 + * Sat Jul 22 2023 Fedora Release Engineering - 4.4.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a51621a3f95b68adfd3ffd2bc9184cea91878b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 21 Nov 2023 14:30:29 +0100 Subject: [PATCH 49/75] New version Resolves: rhbz#2247579 --- sources | 4 ++-- uhd.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index d146703..b1b2a09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.5.0.0.tar.gz) = 20ef6e2ee973476312a1b63e1121f98b9b2f7f471090a26e2492eb4e6ca476421e318294359144306e6663bdc2f4a86040e796707d8757cc83c62ec2a7207d77 -SHA512 (uhd-images_4.5.0.0.tar.xz) = b0b5fe02f59df574be97cb4a867da70a823bf0a3b80f9bcd88bf52248da4dccd48694e50a2d01e588de76c4857bb4cee725a7008776e2685a4d86429f50e7a41 +SHA512 (uhd-4.6.0.0.tar.gz) = de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 +SHA512 (uhd-images_4.6.0.0.tar.xz) = 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3 diff --git a/uhd.spec b/uhd.spec index 5f891a8..d6295b8 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.5.0.0 +Version: 4.6.0.0 %global images_ver %{version} Release: 1%{?dist} License: GPLv3+ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Tue Nov 21 2023 Jaroslav Škarvada - 4.6.0.0-1 +- New version + Resolves: rhbz#2247579 + * Mon Sep 25 2023 Jaroslav Škarvada - 4.5.0.0-1 - New version Resolves: rhbz#2237074 From 85558aa0e55af45a93bd31b8ec8483479b0bbd91 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 18 Jan 2024 00:50:07 +0000 Subject: [PATCH 50/75] Rebuilt for Boost 1.83 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index d6295b8..61eaffb 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Thu Jan 18 2024 Jonathan Wakely - 4.6.0.0-2 +- Rebuilt for Boost 1.83 + * Tue Nov 21 2023 Jaroslav Škarvada - 4.6.0.0-1 - New version Resolves: rhbz#2247579 From 87fb805ffa2e1412552208abeb5fe5c35043bde0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:02:27 +0000 Subject: [PATCH 51/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 61eaffb..6adaea6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.6.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Jonathan Wakely - 4.6.0.0-2 - Rebuilt for Boost 1.83 From f07315bd68e67f57e7935004464a0c1bbd19d7bb Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 52/75] Eliminate use of obsolete %patchN syntax (#2283636) --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6adaea6..2d91d5a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -118,7 +118,7 @@ Wireshark dissector plugins. %prep %setup -q -%patch0 -p1 -b .imagepath-fix +%patch -P0 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} From 1b6120a7b3c061a433ab1848ce11fc8bdfe5659f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:34:34 +0200 Subject: [PATCH 53/75] Rebuilt for Python 3.13 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2d91d5a..f09dd3d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jun 08 2024 Python Maint - 4.6.0.0-4 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 4.6.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 32d9ecc6597ae446accd76318ed80639b9333446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 15 Jul 2024 16:36:07 +0200 Subject: [PATCH 54/75] New version Resolves: rhbz#2293732 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index b1b2a09..aec33dc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.6.0.0.tar.gz) = de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 -SHA512 (uhd-images_4.6.0.0.tar.xz) = 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3 +SHA512 (uhd-4.7.0.0.tar.gz) = 6f2c48890058620499dc4f9661da1fe26fb711225d8f1f4a84cb9a57b049cccdf87d40480618f37bc2aff23b2538b5323f526985ec25a6a1f58122d39387b0cb +SHA512 (uhd-images_4.7.0.0.tar.xz) = a7dd7b5db34b5b204c2248040fc30c542d002b572a7fc47a19b1c9fed4ef213161883eed14e20f1dccd18b8dc3a23f2afafff8350bcb60db520882a5bd775cb4 diff --git a/uhd.spec b/uhd.spec index f09dd3d..578aef9 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.6.0.0 +Version: 4.7.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Jul 15 2024 Jaroslav Škarvada - 4.7.0.0-1 +- New version + Resolves: rhbz#2293732 + * Sat Jun 08 2024 Python Maint - 4.6.0.0-4 - Rebuilt for Python 3.13 From 249f71537f51d31bc6d215925f6a0d3988bc29d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:11:17 +0000 Subject: [PATCH 55/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 578aef9..7b40a2b 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Jaroslav Škarvada - 4.7.0.0-1 - New version Resolves: rhbz#2293732 From 212b456b65a4e9d362f7d18dbe2cdf362b737205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:29:06 +0200 Subject: [PATCH 56/75] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- uhd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index 7b40a2b..ec1bf6d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,8 +31,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 2%{?dist} -License: GPLv3+ +Release: 3%{?dist} +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake @@ -279,6 +280,9 @@ exit 0 %endif %changelog +* Thu Jul 25 2024 Miroslav Suchý - 4.7.0.0-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.7.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b09e6d0822d1b44413ab0a5b7613ec77cebb277c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:40:27 +0000 Subject: [PATCH 57/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index ec1bf6d..f3e49ce 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +280,9 @@ exit 0 %endif %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.7.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 4.7.0.0-3 - convert license to SPDX From 1538edcbf9b516dca08c6d738bd37d3be12bede5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:11 +0100 Subject: [PATCH 58/75] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- uhd.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/uhd.spec b/uhd.spec index f3e49ce..597d03a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 5%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -63,7 +63,7 @@ BuildRequires: tar BuildRequires: sdcc BuildRequires: sed %endif -Requires(pre): shadow-utils, glibc-common +Requires(pre): glibc-common Requires: python3-tkinter Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz @@ -134,6 +134,11 @@ rm -rf images/winusb_driver # fix python shebangs find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \; +# Create a sysusers.d config file +cat >uhd.sysusers.conf </dev/null || \ - %{_sbindir}/groupadd -r usrp >/dev/null 2>&1 -exit 0 %files %exclude %{_docdir}/%{name}/doxygen @@ -255,6 +258,7 @@ exit 0 %{_datadir}/uhd %{python3_sitearch}/uhd %{python3_sitearch}/usrp_mpm +%{_sysusersdir}/uhd.conf %files firmware %dir %{_datadir}/uhd/images @@ -280,6 +284,9 @@ exit 0 %endif %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 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 - 4.7.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ae45f0b982fba47df421421cfa17071ccb6d5ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Mar 2025 10:24:18 +0100 Subject: [PATCH 59/75] New version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#2337610 Resolves: rhbz#2341478 Signed-off-by: Jaroslav Škarvada --- sources | 4 +-- uhd-4.8.0.0-gcc-15-fix.patch | 36 +++++++++++++++++++ ...x.patch => uhd-4.8.0.0-imagepath-fix.patch | 4 +-- uhd.spec | 28 ++++++++++----- 4 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 uhd-4.8.0.0-gcc-15-fix.patch rename uhd-4.2.0.0-imagepath-fix.patch => uhd-4.8.0.0-imagepath-fix.patch (85%) diff --git a/sources b/sources index aec33dc..6a64760 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.7.0.0.tar.gz) = 6f2c48890058620499dc4f9661da1fe26fb711225d8f1f4a84cb9a57b049cccdf87d40480618f37bc2aff23b2538b5323f526985ec25a6a1f58122d39387b0cb -SHA512 (uhd-images_4.7.0.0.tar.xz) = a7dd7b5db34b5b204c2248040fc30c542d002b572a7fc47a19b1c9fed4ef213161883eed14e20f1dccd18b8dc3a23f2afafff8350bcb60db520882a5bd775cb4 +SHA512 (uhd-4.8.0.0.tar.gz) = 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7 +SHA512 (uhd-images_4.8.0.0.tar.xz) = 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 diff --git a/uhd-4.8.0.0-gcc-15-fix.patch b/uhd-4.8.0.0-gcc-15-fix.patch new file mode 100644 index 0000000..ad860ad --- /dev/null +++ b/uhd-4.8.0.0-gcc-15-fix.patch @@ -0,0 +1,36 @@ +diff --git a/host/include/uhd/features/ref_clk_calibration_iface.hpp b/host/include/uhd/features/ref_clk_calibration_iface.hpp +index 86a2005..7aa8062 100644 +--- a/host/include/uhd/features/ref_clk_calibration_iface.hpp ++++ b/host/include/uhd/features/ref_clk_calibration_iface.hpp +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + + namespace uhd { namespace features { +diff --git a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp +index fd23fb8..8f1fc4e 100644 +--- a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp ++++ b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/tools/uhd_dump/uhd_dump.h b/tools/uhd_dump/uhd_dump.h +index 3a6ac4e..12d39e3 100644 +--- a/tools/uhd_dump/uhd_dump.h ++++ b/tools/uhd_dump/uhd_dump.h +@@ -50,7 +50,6 @@ + // UDP used as source for all CHDR comms. + #define CHDR_PORT 49153 + +-typedef unsigned char bool; + typedef unsigned char u8; + typedef unsigned short u16; + typedef unsigned int u32; diff --git a/uhd-4.2.0.0-imagepath-fix.patch b/uhd-4.8.0.0-imagepath-fix.patch similarity index 85% rename from uhd-4.2.0.0-imagepath-fix.patch rename to uhd-4.8.0.0-imagepath-fix.patch index 7230a92..6e825f8 100644 --- a/uhd-4.2.0.0-imagepath-fix.patch +++ b/uhd-4.8.0.0-imagepath-fix.patch @@ -1,8 +1,8 @@ diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 73b4cc2..a122c9d 100644 +index 2eac87e..2a3a3f1 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp -@@ -290,7 +290,7 @@ std::string uhd::get_pkg_path(void) +@@ -283,7 +283,7 @@ std::string uhd::get_pkg_data_path() std::string uhd::get_lib_path(void) { diff --git a/uhd.spec b/uhd.spec index 597d03a..3ac6719 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.7.0.0 +Version: 4.8.0.0 %global images_ver %{version} -Release: 5%{?dist} +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -71,7 +71,9 @@ Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available -Patch0: uhd-4.2.0.0-imagepath-fix.patch +Patch: uhd-4.8.0.0-imagepath-fix.patch +# https://github.com/EttusResearch/uhd/issues/844 +Patch: uhd-4.8.0.0-gcc-15-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -118,8 +120,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q -%patch -P0 -p1 -b .imagepath-fix +%autosetup -p1 # firmware %if %{with binary_firmware} @@ -151,22 +152,27 @@ popd %endif 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 ../ + -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}" +make %{?_smp_mflags} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" popd %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -%cmake -DENABLE_RFNOC=ON -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON +%cmake -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON %cmake_build popd %endif @@ -247,7 +253,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %{_bindir}/usrpctl %{_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 @@ -284,6 +289,11 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Wed Mar 12 2025 Jaroslav Škarvada - 4.8.0.0-1 +- New version + Resolves: rhbz#2337610 + Resolves: rhbz#2341478 + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.7.0.0-5 - Add sysusers.d config file to allow rpm to create users/groups automatically From c79fdf3ba9559946ad2642e02f8517e2b97ba12a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:31:02 +0200 Subject: [PATCH 60/75] Rebuilt for Python 3.14 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 3ac6719..6ed9a76 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Jun 03 2025 Python Maint - 4.8.0.0-2 +- Rebuilt for Python 3.14 + * Wed Mar 12 2025 Jaroslav Škarvada - 4.8.0.0-1 - New version Resolves: rhbz#2337610 From e93033b410eb607a281d627893abf6e18f1829a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:44:33 +0000 Subject: [PATCH 61/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6ed9a76..7a37f06 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.8.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 4.8.0.0-2 - Rebuilt for Python 3.14 From e22a339e17746075a3b01c8a365560c1dc106fa7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:21 +0200 Subject: [PATCH 62/75] Rebuilt for Python 3.14.0rc2 bytecode --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 7a37f06..aff47ae 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Aug 15 2025 Python Maint - 4.8.0.0-4 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 4.8.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From fd8faa4c648296f13ac68da25326a0648bfaf349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 17:50:59 +0200 Subject: [PATCH 63/75] New version Resolves: rhbz#2387862 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 6a64760..2d55172 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.8.0.0.tar.gz) = 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7 -SHA512 (uhd-images_4.8.0.0.tar.xz) = 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 +SHA512 (uhd-4.9.0.0.tar.gz) = df8dc56035c5fb18b958fdb6ffd28ed1bbf4a4dd051800865fe4e9a2df953e13e1930ed285507dc6d2736443a285283741b1d0dc3dae862b0bb3e477d8532641 +SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 diff --git a/uhd.spec b/uhd.spec index aff47ae..0555fad 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.8.0.0 +Version: 4.9.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Thu Sep 11 2025 Jaroslav Škarvada - 4.9.0.0-1 +- New version + Resolves: rhbz#2387862 + * Fri Aug 15 2025 Python Maint - 4.8.0.0-4 - Rebuilt for Python 3.14.0rc2 bytecode From 9f6339d121caa0e9a035571ac38f0a3309e3520b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 18:02:10 +0200 Subject: [PATCH 64/75] Dropped unneeded patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.8.0.0-gcc-15-fix.patch | 36 ------------------------------------ uhd.spec | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 uhd-4.8.0.0-gcc-15-fix.patch diff --git a/uhd-4.8.0.0-gcc-15-fix.patch b/uhd-4.8.0.0-gcc-15-fix.patch deleted file mode 100644 index ad860ad..0000000 --- a/uhd-4.8.0.0-gcc-15-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/host/include/uhd/features/ref_clk_calibration_iface.hpp b/host/include/uhd/features/ref_clk_calibration_iface.hpp -index 86a2005..7aa8062 100644 ---- a/host/include/uhd/features/ref_clk_calibration_iface.hpp -+++ b/host/include/uhd/features/ref_clk_calibration_iface.hpp -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - - namespace uhd { namespace features { -diff --git a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -index fd23fb8..8f1fc4e 100644 ---- a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -+++ b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/tools/uhd_dump/uhd_dump.h b/tools/uhd_dump/uhd_dump.h -index 3a6ac4e..12d39e3 100644 ---- a/tools/uhd_dump/uhd_dump.h -+++ b/tools/uhd_dump/uhd_dump.h -@@ -50,7 +50,6 @@ - // UDP used as source for all CHDR comms. - #define CHDR_PORT 49153 - --typedef unsigned char bool; - typedef unsigned char u8; - typedef unsigned short u16; - typedef unsigned int u32; diff --git a/uhd.spec b/uhd.spec index 0555fad..c9457f1 100644 --- a/uhd.spec +++ b/uhd.spec @@ -72,8 +72,6 @@ Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver} # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available Patch: uhd-4.8.0.0-imagepath-fix.patch -# https://github.com/EttusResearch/uhd/issues/844 -Patch: uhd-4.8.0.0-gcc-15-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. From e1213c9be03630663817bbf395a696a8096aacee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 18:17:57 +0200 Subject: [PATCH 65/75] Followed upstream and dropped uhd_dump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/uhd.spec b/uhd.spec index c9457f1..a4e4062 100644 --- a/uhd.spec +++ b/uhd.spec @@ -162,11 +162,6 @@ pushd host %cmake_build popd -# tools -pushd tools/uhd_dump -make %{?_smp_mflags} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -popd - %if %{with wireshark} # wireshark dissectors pushd tools/dissectors @@ -223,7 +218,6 @@ 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 %if %{with wireshark} # wireshark dissectors From df04e96c52285e1302c9641362c8c218402eacde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 12 Sep 2025 00:35:43 +0200 Subject: [PATCH 66/75] Dropped chdr_log as upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index a4e4062..028638f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -273,7 +273,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %files tools %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh -%{_bindir}/chdr_log %if %{with wireshark} %files wireshark From 0808e1d684b95c307c562e660598bb32699ad951 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:01:00 +0200 Subject: [PATCH 67/75] Rebuilt for Python 3.14.0rc3 bytecode --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 028638f..d886d98 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.9.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +280,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Sep 19 2025 Python Maint - 4.9.0.0-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Sep 11 2025 Jaroslav Škarvada - 4.9.0.0-1 - New version Resolves: rhbz#2387862 From ff6fd8bff685cd3aeec2b1554fe9d03a17ed7ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 13 Oct 2025 17:25:34 +0200 Subject: [PATCH 68/75] New version Resolves: rhbz#2403533 --- sources | 2 +- uhd.spec | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 2d55172..05dffa9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.9.0.0.tar.gz) = df8dc56035c5fb18b958fdb6ffd28ed1bbf4a4dd051800865fe4e9a2df953e13e1930ed285507dc6d2736443a285283741b1d0dc3dae862b0bb3e477d8532641 +SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497 SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 diff --git a/uhd.spec b/uhd.spec index d886d98..b6d82e7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.9.0.0 -%global images_ver %{version} -Release: 2%{?dist} +Version: 4.9.0.1 +#%%global images_ver %%{version} +%global images_ver 4.9.0.0 +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +281,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Mon Oct 13 2025 Jaroslav Škarvada - 4.9.0.1-2 +- New version + Resolves: rhbz#2403533 + * Fri Sep 19 2025 Python Maint - 4.9.0.0-2 - Rebuilt for Python 3.14.0rc3 bytecode From 5c4d17f8f523fa3a205dadcb3662cecd7c05ef74 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2026 18:30:39 +0000 Subject: [PATCH 69/75] Rebuilt for Boost 1.90 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b6d82e7..20a398c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.9.0.1 #%%global images_ver %%{version} %global images_ver 4.9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -281,6 +281,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Mon Jan 12 2026 Jonathan Wakely - 4.9.0.1-2 +- Rebuilt for Boost 1.90 + * Mon Oct 13 2025 Jaroslav Škarvada - 4.9.0.1-2 - New version Resolves: rhbz#2403533 From 1baf9fd961dfa3abdb99e54138ceda121469f8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 13 Jan 2026 16:35:41 +0100 Subject: [PATCH 70/75] Fixed build with cmake-4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.9.0.1-cmake-4-fix.patch | 65 +++++++++++++++++++++++++++++++++++ uhd.spec | 4 ++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 uhd-4.9.0.1-cmake-4-fix.patch diff --git a/uhd-4.9.0.1-cmake-4-fix.patch b/uhd-4.9.0.1-cmake-4-fix.patch new file mode 100644 index 0000000..df096a3 --- /dev/null +++ b/uhd-4.9.0.1-cmake-4-fix.patch @@ -0,0 +1,65 @@ +diff --git a/firmware/fx2/CMakeLists.txt b/firmware/fx2/CMakeLists.txt +index 7a41333..10a363d 100644 +--- a/firmware/fx2/CMakeLists.txt ++++ b/firmware/fx2/CMakeLists.txt +@@ -15,7 +15,7 @@ + # along with this program. If not, see . + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/config/Toolchain-sdcc.cmake) + project(USRP1 C) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") +diff --git a/firmware/octoclock/CMakeLists.txt b/firmware/octoclock/CMakeLists.txt +index 4d99add..483a191 100644 +--- a/firmware/octoclock/CMakeLists.txt ++++ b/firmware/octoclock/CMakeLists.txt +@@ -15,7 +15,7 @@ + # along with this program. If not, see . + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_SYSTEM_NAME Generic) + + find_program(AVR_CC avr-gcc REQUIRED) +diff --git a/firmware/usrp2/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt +index 693fbf9..9ec61f8 100644 +--- a/firmware/usrp2/CMakeLists.txt ++++ b/firmware/usrp2/CMakeLists.txt +@@ -18,7 +18,7 @@ + ######################################################################## + # setup project and compiler + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + #force the compiler because the check wont use the special flag below + include(CMakeForceCompiler) + set(CMAKE_SYSTEM_NAME Generic) +diff --git a/firmware/usrp3/CMakeLists.txt b/firmware/usrp3/CMakeLists.txt +index 9cfbe99..bfbcb83 100644 +--- a/firmware/usrp3/CMakeLists.txt ++++ b/firmware/usrp3/CMakeLists.txt +@@ -18,7 +18,7 @@ + ######################################################################## + # setup project and compiler + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + #force the compiler because the check wont use the special flag below + include(CMakeForceCompiler) + set(CMAKE_SYSTEM_NAME Generic) +diff --git a/tools/dissectors/CMakeLists.txt b/tools/dissectors/CMakeLists.txt +index 8fa8542..af67ee0 100644 +--- a/tools/dissectors/CMakeLists.txt ++++ b/tools/dissectors/CMakeLists.txt +@@ -4,7 +4,7 @@ + # SPDX-License-Identifier: GPL-3.0-or-later + # + +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + cmake_policy(SET CMP0048 NEW) + project(EttusDissectors VERSION 4.0.0 DESCRIPTION "Dissector Plugins" LANGUAGES C CXX) + diff --git a/uhd.spec b/uhd.spec index 20a398c..e5f50c1 100644 --- a/uhd.spec +++ b/uhd.spec @@ -73,6 +73,8 @@ Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver} # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available Patch: uhd-4.8.0.0-imagepath-fix.patch +# already in upstream +Patch: uhd-4.9.0.1-cmake-4-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -173,7 +175,7 @@ popd #%%check #cd host/%%{_vpath_builddir} -#make test +#%%ctest %install # fix python shebangs (run again for generated scripts) From 23b5fbbc6736c96b31107f90637f96b288ebea6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 20 Jan 2026 03:31:08 +0000 Subject: [PATCH 71/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e5f50c1..142ba1f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.9.0.1 #%%global images_ver %%{version} %global images_ver 4.9.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -283,6 +283,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Jan 20 2026 Fedora Release Engineering - 4.9.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Jan 12 2026 Jonathan Wakely - 4.9.0.1-2 - Rebuilt for Boost 1.90 From 1c486dd191d9ebced50cb2a9ab7e47ebb18c49f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 Apr 2026 13:38:36 +0200 Subject: [PATCH 72/75] New version Resolves: rhbz#2451594 --- sources | 4 +- uhd-4.8.0.0-imagepath-fix.patch | 13 ------- uhd-4.9.0.1-cmake-4-fix.patch | 65 --------------------------------- uhd.spec | 15 ++++---- 4 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 uhd-4.8.0.0-imagepath-fix.patch delete mode 100644 uhd-4.9.0.1-cmake-4-fix.patch diff --git a/sources b/sources index 05dffa9..15eff2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497 -SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 +SHA512 (uhd-4.10.0.0.tar.gz) = 600b6c8b1d5e37643e086d00e3c594b6b83a467b097576625dd4a949b3aab81cbbc221f2649a639fef67dfc0dce3bb919abee3cfb6ca266ad547262a16cdbd0e +SHA512 (uhd-images_4.10.0.0.tar.xz) = c5e54f47361a71baa3b5450fd4a3970a03349ecd69837a5de03a63f42b977f1e7e7246c0645d7178feac31f0c071e1914b3d8fcd60f8031aef4cfa45539d5054 diff --git a/uhd-4.8.0.0-imagepath-fix.patch b/uhd-4.8.0.0-imagepath-fix.patch deleted file mode 100644 index 6e825f8..0000000 --- a/uhd-4.8.0.0-imagepath-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 2eac87e..2a3a3f1 100644 ---- a/host/lib/utils/paths.cpp -+++ b/host/lib/utils/paths.cpp -@@ -283,7 +283,7 @@ std::string uhd::get_pkg_data_path() - - std::string uhd::get_lib_path(void) - { -- fs::path runtime_libfile_path = boost::dll::this_line_location(); -+ fs::path runtime_libfile_path = "/usr" / boost::dll::this_line_location(); - // Normalize before decomposing path so result is reliable - fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path(); - return lib_path.string(); diff --git a/uhd-4.9.0.1-cmake-4-fix.patch b/uhd-4.9.0.1-cmake-4-fix.patch deleted file mode 100644 index df096a3..0000000 --- a/uhd-4.9.0.1-cmake-4-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/firmware/fx2/CMakeLists.txt b/firmware/fx2/CMakeLists.txt -index 7a41333..10a363d 100644 ---- a/firmware/fx2/CMakeLists.txt -+++ b/firmware/fx2/CMakeLists.txt -@@ -15,7 +15,7 @@ - # along with this program. If not, see . - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/config/Toolchain-sdcc.cmake) - project(USRP1 C) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") -diff --git a/firmware/octoclock/CMakeLists.txt b/firmware/octoclock/CMakeLists.txt -index 4d99add..483a191 100644 ---- a/firmware/octoclock/CMakeLists.txt -+++ b/firmware/octoclock/CMakeLists.txt -@@ -15,7 +15,7 @@ - # along with this program. If not, see . - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_SYSTEM_NAME Generic) - - find_program(AVR_CC avr-gcc REQUIRED) -diff --git a/firmware/usrp2/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt -index 693fbf9..9ec61f8 100644 ---- a/firmware/usrp2/CMakeLists.txt -+++ b/firmware/usrp2/CMakeLists.txt -@@ -18,7 +18,7 @@ - ######################################################################## - # setup project and compiler - ######################################################################## --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - #force the compiler because the check wont use the special flag below - include(CMakeForceCompiler) - set(CMAKE_SYSTEM_NAME Generic) -diff --git a/firmware/usrp3/CMakeLists.txt b/firmware/usrp3/CMakeLists.txt -index 9cfbe99..bfbcb83 100644 ---- a/firmware/usrp3/CMakeLists.txt -+++ b/firmware/usrp3/CMakeLists.txt -@@ -18,7 +18,7 @@ - ######################################################################## - # setup project and compiler - ######################################################################## --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - #force the compiler because the check wont use the special flag below - include(CMakeForceCompiler) - set(CMAKE_SYSTEM_NAME Generic) -diff --git a/tools/dissectors/CMakeLists.txt b/tools/dissectors/CMakeLists.txt -index 8fa8542..af67ee0 100644 ---- a/tools/dissectors/CMakeLists.txt -+++ b/tools/dissectors/CMakeLists.txt -@@ -4,7 +4,7 @@ - # SPDX-License-Identifier: GPL-3.0-or-later - # - --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.5) - cmake_policy(SET CMP0048 NEW) - project(EttusDissectors VERSION 4.0.0 DESCRIPTION "Dissector Plugins" LANGUAGES C CXX) - diff --git a/uhd.spec b/uhd.spec index 142ba1f..1f5d9a4 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.9.0.1 +Version: 4.10.0.0 #%%global images_ver %%{version} -%global images_ver 4.9.0.0 -Release: 3%{?dist} +%global images_ver 4.10.0.0 +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -70,11 +70,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%{images_ver}/uhd-images_%{images_ver}.tar.xz -# dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 -# until the better fix is available -Patch: uhd-4.8.0.0-imagepath-fix.patch -# already in upstream -Patch: uhd-4.9.0.1-cmake-4-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -283,6 +278,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Apr 28 2026 Jaroslav Škarvada - 4.10.0.0-1 +- New version + Resolves: rhbz#2451594 + * Tue Jan 20 2026 Fedora Release Engineering - 4.9.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 77495c7172a7fc42c43f6d74de51d37b4e3bad03 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:17 +0200 Subject: [PATCH 73/75] Rebuilt for Python 3.15 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 1f5d9a4..018fed5 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Thu Jun 04 2026 Python Maint - 4.10.0.0-2 +- Rebuilt for Python 3.15 + * Tue Apr 28 2026 Jaroslav Škarvada - 4.10.0.0-1 - New version Resolves: rhbz#2451594 From 69834dded8aceb7170094f5e52c447880eefcbcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:08:18 +0000 Subject: [PATCH 74/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 018fed5..2c1c096 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.10.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 4.10.0.0-2 - Rebuilt for Python 3.15 From acfe813c92501f3f69407edb0ba32c547f44eb1a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:11:19 +0200 Subject: [PATCH 75/75] Rebuilt for Python 3.15.0b4 ABI change --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2c1c096..4adc306 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Wed Jul 22 2026 Python Maint - 4.10.0.0-4 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 4.10.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild