New version, switched to git snapshot
Conditionalized wireshark support Disabled wireshark support, it's currently broken (upstream ticket #268) Disabled tests, it's currently broken (upstream ticket #267) Dropped boost169 patch (not needed)
This commit is contained in:
Jaroslav Škarvada
parent
111f9ee51b
commit
2a6210da45
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (uhd-3.12.0.0.tar.gz) = 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
|
||||
SHA512 (uhd-images_3.12.0.0.tar.xz) = 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
|
||||
SHA512 (uhd-images_3.14.0.0.tar.xz) = a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
|
||||
SHA512 (uhd-3.14.0.0-ac96d055.tar.gz) = 2a913ad0f78563fc0d47a74022e87d15004f14f4290313ec221ac96e729438e772b4b6d359e6d94f286ff935324863a2423c0eed409d36825c620f69d2c0e840
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Braun <martin.braun@ettus.com>
|
||||
Date: Wed, 9 Jan 2019 09:17:07 -0800
|
||||
Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred
|
||||
include
|
||||
|
||||
This adds an include for boost/core/noncopyable.hpp. Without it, builds
|
||||
would potentially fail on Boost 1.69++.
|
||||
---
|
||||
host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
||||
index 697ca19c3..8fa183835 100644
|
||||
--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
||||
+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <uhd/exception.hpp>
|
||||
#include <uhd/utils/dirty_tracked.hpp>
|
||||
#include <uhd/types/time_spec.hpp>
|
||||
+#include <boost/core/noncopyable.hpp>
|
||||
#include <boost/function.hpp>
|
||||
#include <boost/thread/recursive_mutex.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
|
||||
From f1d6d1e480ca873259c816c0bd2dac5eb7aecd5a Mon Sep 17 00:00:00 2001
|
||||
From: Martin Braun <martin.braun@ettus.com>
|
||||
Date: Wed, 9 Jan 2019 16:24:01 -0800
|
||||
Subject: [PATCH] lib: experts: fixup for including Boost header
|
||||
|
||||
Header wasn't included until Boost 1.56.
|
||||
|
||||
Fixes 5c012cad7858 ("lib: experts: Add potentially missing but...")
|
||||
---
|
||||
host/lib/include/uhdlib/experts/expert_nodes.hpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
||||
index 8fa183835..a540fc49d 100644
|
||||
--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
||||
+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
||||
@@ -12,7 +12,9 @@
|
||||
#include <uhd/exception.hpp>
|
||||
#include <uhd/utils/dirty_tracked.hpp>
|
||||
#include <uhd/types/time_spec.hpp>
|
||||
+#if BOOST_VERSION >= 105600
|
||||
#include <boost/core/noncopyable.hpp>
|
||||
+#endif
|
||||
#include <boost/function.hpp>
|
||||
#include <boost/thread/recursive_mutex.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
|
||||
From 66df76097953ecd3ea7e0154049da949f2306743 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Braun <martin.braun@ettus.com>
|
||||
Date: Mon, 14 Jan 2019 13:34:13 -0800
|
||||
Subject: [PATCH] includes: Make sure BOOST_VERSION is always available
|
||||
|
||||
Boost changed the includes, and boost/version.hpp was being implicitly
|
||||
imported. This makes the include explicit.
|
||||
---
|
||||
host/include/uhd/config.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
|
||||
index 0f619c94a..e7b48e5d8 100644
|
||||
--- a/host/include/uhd/config.hpp
|
||||
+++ b/host/include/uhd/config.hpp
|
||||
@@ -9,6 +9,7 @@
|
||||
#define INCLUDED_UHD_CONFIG_HPP
|
||||
|
||||
#include <boost/config.hpp>
|
||||
+#include <boost/version.hpp>
|
||||
|
||||
#ifdef BOOST_MSVC
|
||||
// suppress warnings
|
||||
50
uhd.spec
50
uhd.spec
|
|
@ -1,8 +1,18 @@
|
|||
%global git_commit ac96d055091c29e2c6b08762b3b3d9da8db5b855
|
||||
%global git_date 20190401
|
||||
|
||||
%global git_short_commit %(echo %{git_commit} | cut -c -8)
|
||||
%global git_suffix %{git_date}git%{git_short_commit}
|
||||
|
||||
# By default include binary_firmware, otherwise try to rebuild
|
||||
# the firmware from sources. If you want to rebuild all firmware
|
||||
# images you need to install appropriate tools (e.g. Xilinx ISE).
|
||||
%bcond_without binary_firmware
|
||||
|
||||
# By default do not build with wireshark support, it's currently
|
||||
# broken (upstream ticket #268)
|
||||
%bcond_with wireshark
|
||||
|
||||
# NEON support is by default disabled on ARMs
|
||||
# building with --with=neon will enable auto detection
|
||||
%bcond_with neon
|
||||
|
|
@ -18,13 +28,16 @@
|
|||
|
||||
Name: uhd
|
||||
URL: http://github.com/EttusResearch/uhd
|
||||
Version: 3.12.0.0
|
||||
Release: 5%{?dist}
|
||||
Version: 3.14.0.0
|
||||
Release: 1.%{git_suffix}%{?dist}
|
||||
License: GPLv3+
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel
|
||||
BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel
|
||||
BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel
|
||||
%if %{with wireshark}
|
||||
BuildRequires: wireshark-devel
|
||||
%endif
|
||||
BuildRequires: python2-mako, python2-requests, python2-devel, tar
|
||||
%if ! %{with binary_firmware}
|
||||
BuildRequires: sdcc sed
|
||||
|
|
@ -32,11 +45,10 @@ BuildRequires: sdcc sed
|
|||
Requires(pre): shadow-utils, glibc-common
|
||||
Requires: python2-tkinter
|
||||
Summary: Universal Hardware Driver for Ettus Research products
|
||||
Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz
|
||||
#Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz
|
||||
Source0: %{url}/archive/%{git_commit}/uhd-%{version}-%{git_short_commit}.tar.gz
|
||||
Source1: %{name}-limits.conf
|
||||
Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz
|
||||
# Patches for Boost 1.69 support https://github.com/EttusResearch/uhd/pull/248
|
||||
Patch0: %{name}-boost169.patch
|
||||
|
||||
%description
|
||||
The UHD is the universal hardware driver for Ettus Research products.
|
||||
|
|
@ -72,6 +84,7 @@ Requires: %{name} = %{version}-%{release}
|
|||
%description tools
|
||||
Tools that are useful for working with and/or debugging USRP device.
|
||||
|
||||
%if %{with wireshark}
|
||||
%package wireshark
|
||||
Summary: Wireshark dissector plugins
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
|
@ -79,10 +92,10 @@ Requires: wireshark = %{wireshark_ver}
|
|||
|
||||
%description wireshark
|
||||
Wireshark dissector plugins.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%setup -q -n %{name}-%{git_commit}
|
||||
|
||||
# firmware
|
||||
%if %{with binary_firmware}
|
||||
|
|
@ -111,7 +124,7 @@ popd
|
|||
mkdir -p host/build
|
||||
pushd host/build
|
||||
%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \
|
||||
-DUHD_VERSION="%{version}" ../
|
||||
-DUHD_VERSION="%{version}" -DENABLE_TESTS=off ../
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
|
||||
|
|
@ -120,6 +133,7 @@ pushd tools/uhd_dump
|
|||
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}"
|
||||
popd
|
||||
|
||||
%if %{with wireshark}
|
||||
# wireshark dissectors
|
||||
pushd tools/dissectors
|
||||
for d in %{wireshark_dissectors}
|
||||
|
|
@ -131,10 +145,11 @@ do
|
|||
popd
|
||||
done
|
||||
popd
|
||||
%endif
|
||||
|
||||
%check
|
||||
cd host/build
|
||||
make test
|
||||
#%%check
|
||||
#cd host/build
|
||||
#make test
|
||||
|
||||
%install
|
||||
# fix python shebangs (run again for generated scripts)
|
||||
|
|
@ -182,6 +197,7 @@ popd
|
|||
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
|
||||
pushd tools/dissectors
|
||||
for d in %{wireshark_dissectors}
|
||||
|
|
@ -192,6 +208,7 @@ do
|
|||
done
|
||||
popd
|
||||
mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark
|
||||
%endif
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
|
@ -231,10 +248,19 @@ exit 0
|
|||
%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh
|
||||
%{_bindir}/chdr_log
|
||||
|
||||
%if %{with wireshark}
|
||||
%files wireshark
|
||||
%{_libdir}/wireshark/plugins/*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Apr 15 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.0.0-1.20190401gitac96d055
|
||||
- New version, switched to git snapshot
|
||||
- Conditionalized wireshark support
|
||||
- Disabled wireshark support, it's currently broken (upstream ticket #268)
|
||||
- Disabled tests, it's currently broken (upstream ticket #267)
|
||||
- Dropped boost169 patch (not needed)
|
||||
|
||||
* Mon Apr 1 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.12.0.0-5
|
||||
- Re-introduced usrp group
|
||||
Resolves: rhbz#1694665
|
||||
|
|
|
|||
Loading…
Reference in New Issue