From 49229bd6ae6013a318497fb3c389652fa46c040f Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Jan 28 2022 23:40:07 +0000 Subject: Fixed images path --- 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