Compare commits
No commits in common. "rawhide" and "f34" have entirely different histories.
4 changed files with 56 additions and 146 deletions
4
sources
4
sources
|
|
@ -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-images_4.1.0.4.tar.xz) = 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b
|
||||
SHA512 (uhd-4.1.0.5.tar.gz) = 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
|
||||
|
|
|
|||
13
uhd-4.1.0.5-imagepath-fix.patch
Normal file
13
uhd-4.1.0.5-imagepath-fix.patch
Normal file
|
|
@ -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();
|
||||
10
uhd-4.1.0.5-s390x-build-fix.patch
Normal file
10
uhd-4.1.0.5-s390x-build-fix.patch
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
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)
|
||||
+
|
||||
+LIBUHD_APPEND_LIBS(atomic)
|
||||
175
uhd.spec
175
uhd.spec
|
|
@ -29,12 +29,11 @@
|
|||
|
||||
Name: uhd
|
||||
URL: http://github.com/EttusResearch/uhd
|
||||
Version: 4.10.0.0
|
||||
Version: 4.1.0.5
|
||||
#%%global images_ver %%{version}
|
||||
%global images_ver 4.10.0.0
|
||||
%global images_ver 4.1.0.4
|
||||
Release: 4%{?dist}
|
||||
# Automatically converted from old format: GPLv3+ - review is highly recommended.
|
||||
License: GPL-3.0-or-later
|
||||
License: GPLv3+
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
|
|
@ -54,7 +53,6 @@ BuildRequires: wireshark-devel
|
|||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: gnutls-devel
|
||||
%endif
|
||||
BuildRequires: pybind11-devel
|
||||
BuildRequires: python3-mako
|
||||
BuildRequires: python3-requests
|
||||
BuildRequires: python3-devel
|
||||
|
|
@ -64,12 +62,17 @@ BuildRequires: tar
|
|||
BuildRequires: sdcc
|
||||
BuildRequires: sed
|
||||
%endif
|
||||
Requires(pre): glibc-common
|
||||
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
|
||||
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.
|
||||
|
|
@ -116,7 +119,9 @@ Wireshark dissector plugins.
|
|||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
%patch1 -p1 -b .s390x-build-fix
|
||||
%patch2 -p1 -b .imagepath-fix
|
||||
|
||||
# firmware
|
||||
%if %{with binary_firmware}
|
||||
|
|
@ -131,11 +136,6 @@ 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 <<EOF
|
||||
g usrp -
|
||||
EOF
|
||||
|
||||
%build
|
||||
# firmware
|
||||
%if ! %{with binary_firmware}
|
||||
|
|
@ -148,29 +148,28 @@ 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 ../ \
|
||||
%if "%{?_lib}"=="lib64"
|
||||
-DLIB_SUFFIX=64
|
||||
%endif
|
||||
-DENABLE_TESTS=off ../
|
||||
%cmake_build
|
||||
popd
|
||||
|
||||
# tools
|
||||
pushd tools/uhd_dump
|
||||
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}"
|
||||
popd
|
||||
|
||||
%if %{with wireshark}
|
||||
# wireshark dissectors
|
||||
pushd tools/dissectors
|
||||
%cmake -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON
|
||||
%cmake -DENABLE_RFNOC=ON -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON
|
||||
%cmake_build
|
||||
popd
|
||||
%endif
|
||||
|
||||
#%%check
|
||||
#cd host/%%{_vpath_builddir}
|
||||
#%%ctest
|
||||
#make test
|
||||
|
||||
%install
|
||||
# fix python shebangs (run again for generated scripts)
|
||||
|
|
@ -180,7 +179,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
|
||||
|
||||
|
|
@ -216,6 +215,7 @@ 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
|
||||
|
|
@ -230,19 +230,21 @@ mv %{buildroot}%{_prefix}/epan %{buildroot}%{_libdir}/wireshark/plugins/%{wiresh
|
|||
# add directory for modules
|
||||
mkdir -p %{buildroot}%{_libdir}/uhd/modules
|
||||
|
||||
install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%pre
|
||||
getent group usrp >/dev/null || \
|
||||
%{_sbindir}/groupadd -r usrp >/dev/null 2>&1
|
||||
exit 0
|
||||
|
||||
%files
|
||||
%exclude %{_docdir}/%{name}/doxygen
|
||||
%exclude %{_datadir}/uhd/images
|
||||
%doc _tmpdoc/*
|
||||
%dir %{_libdir}/uhd
|
||||
%{_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
|
||||
|
|
@ -253,7 +255,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf
|
|||
%{_datadir}/uhd
|
||||
%{python3_sitearch}/uhd
|
||||
%{python3_sitearch}/usrp_mpm
|
||||
%{_sysusersdir}/uhd.conf
|
||||
|
||||
%files firmware
|
||||
%dir %{_datadir}/uhd/images
|
||||
|
|
@ -271,6 +272,10 @@ 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
|
||||
%{_bindir}/aurora_bist_test.py
|
||||
%{_bindir}/usrp_update_fs
|
||||
%{_bindir}/e320_bist
|
||||
|
||||
%if %{with wireshark}
|
||||
%files wireshark
|
||||
|
|
@ -278,124 +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
|
||||
|
||||
* Mon Jan 12 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 4.9.0.1-2
|
||||
- Rebuilt for Boost 1.90
|
||||
|
||||
* Mon Oct 13 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.9.0.1-2
|
||||
- New version
|
||||
Resolves: rhbz#2403533
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.9.0.0-2
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Thu Sep 11 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.9.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2387862
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.8.0.0-4
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 4.8.0.0-2
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Wed Mar 12 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.8.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2337610
|
||||
Resolves: rhbz#2341478
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.0.0-5
|
||||
- Add sysusers.d config file to allow rpm to create users/groups automatically
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 4.7.0.0-3
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jul 15 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 4.7.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2293732
|
||||
|
||||
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 4.6.0.0-4
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 4.6.0.0-2
|
||||
- Rebuilt for Boost 1.83
|
||||
|
||||
* Tue Nov 21 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.6.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2247579
|
||||
|
||||
* Mon Sep 25 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2237074
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 4.4.0.0-3
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 4.4.0.0-2
|
||||
- Rebuilt for Boost 1.81
|
||||
|
||||
* Wed Feb 1 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.4.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2164284
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Sep 24 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.3.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2124734
|
||||
|
||||
* Fri Jul 29 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.1-1
|
||||
- New version
|
||||
Resolves: rhbz#2110023
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.0-3
|
||||
- Rebuilt for new python
|
||||
Resolves: rhbz#2099182
|
||||
|
||||
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 4.2.0.0-2
|
||||
- Rebuilt for Boost 1.78
|
||||
|
||||
* Thu Apr 21 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.0-1
|
||||
- New version
|
||||
Resolves: rhbz#2073640
|
||||
|
||||
* Tue Feb 1 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-5
|
||||
- Switched to the upstream patch to fix compilation on the s390x
|
||||
|
||||
* Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-4
|
||||
- Fixed images path
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue