diff options
| author |   Matt Reilly <kb1vc@kb1vc.org> | 2019-01-22 20:58:41 -0500 |
|---|---|---|
| committer |   Martin Braun <martin.braun@ettus.com> | 2019-01-28 14:18:44 +0100 |
| commit | 1f254f1ce19c4732de9cca8f543a4fb676cdd93d (patch) | |
| tree | 617523832eed701969925444291d857f69798deb | |
| parent | ad9361: Replace Boost lock & mutex with std variety (diff) | |
| download | uhd-1f254f1ce19c4732de9cca8f543a4fb676cdd93d.tar.xz uhd-1f254f1ce19c4732de9cca8f543a4fb676cdd93d.zip | |
cpack: Fix RPM generation
UHDPackage.cmake produced new directory entries ("%dir" directives)
for /usr/local and other folders... This produced conflicts with the
filesystem package on Fedora 28 (at least).
Added set of CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION to the cmake
rpm package instructions. This fixes the problem and produces a working
rpm for Fedora 28 x86_64.
The redhat post_install.in file was referring to the /usr/lib tree,
which is now /usr/lib64, so the script failed to install the
uhd-usrp.rules. That's been fixed too.
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 2 | ||||
| -rwxr-xr-x | host/cmake/redhat/post_install.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 9c418f331..de7304f1b 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -177,7 +177,7 @@ configure_file( # Setup CPack RPM ######################################################################## set(CPACK_RPM_PACKAGE_REQUIRES "boost-devel, python-requests") - +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/man;/usr/share/man/man1;/usr/lib64/pkgconfig;/usr/lib64/cmake;/usr/lib64/python2.7;/usr/lib64/python2.7/site-packages") foreach(filename post_install post_uninstall pre_install pre_uninstall) string(TOUPPER ${filename} filename_upper) list(APPEND CPACK_RPM_${filename_upper}_SCRIPT_FILE ${CMAKE_BINARY_DIR}/redhat/${filename}) diff --git a/host/cmake/redhat/post_install.in b/host/cmake/redhat/post_install.in index d02ba4441..c7820ff98 100755 --- a/host/cmake/redhat/post_install.in +++ b/host/cmake/redhat/post_install.in @@ -6,7 +6,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -cp @CMAKE_INSTALL_PREFIX@/lib/uhd/utils/uhd-usrp.rules /etc/udev/rules.d/uhd-usrp.rules +cp @CMAKE_INSTALL_PREFIX@/lib64/uhd/utils/uhd-usrp.rules /etc/udev/rules.d/uhd-usrp.rules udevadm control --reload-rules udevadm trigger ldconfig |