From 1f254f1ce19c4732de9cca8f543a4fb676cdd93d Mon Sep 17 00:00:00 2001 From: Matt Reilly Date: Tue, 22 Jan 2019 20:58:41 -0500 Subject: 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. --- host/cmake/Modules/UHDPackage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'host/cmake/Modules/UHDPackage.cmake') 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}) -- cgit v1.2.3