Compare commits

..

No commits in common. "rawhide" and "f44" have entirely different histories.

4 changed files with 88 additions and 18 deletions

View file

@ -1,2 +1,2 @@
SHA512 (uhd-4.10.0.0.tar.gz) = 600b6c8b1d5e37643e086d00e3c594b6b83a467b097576625dd4a949b3aab81cbbc221f2649a639fef67dfc0dce3bb919abee3cfb6ca266ad547262a16cdbd0e
SHA512 (uhd-images_4.10.0.0.tar.xz) = c5e54f47361a71baa3b5450fd4a3970a03349ecd69837a5de03a63f42b977f1e7e7246c0645d7178feac31f0c071e1914b3d8fcd60f8031aef4cfa45539d5054
SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497
SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3

View file

@ -0,0 +1,13 @@
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();

View file

@ -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 <http://www.gnu.org/licenses/>.
#
-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 <http://www.gnu.org/licenses/>.
#
-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)

View file

@ -29,10 +29,10 @@
Name: uhd
URL: http://github.com/EttusResearch/uhd
Version: 4.10.0.0
Version: 4.9.0.1
#%%global images_ver %%{version}
%global images_ver 4.10.0.0
Release: 4%{?dist}
%global images_ver 4.9.0.0
Release: 3%{?dist}
# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
BuildRequires: make
@ -70,6 +70,11 @@ 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.
@ -278,19 +283,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf
%endif
%changelog
* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 4.10.0.0-4
- Rebuilt for Python 3.15.0b4 ABI change
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 4.10.0.0-2
- Rebuilt for Python 3.15
* Tue Apr 28 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 4.10.0.0-1
- New version
Resolves: rhbz#2451594
* Tue Jan 20 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild