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/redhat/post_install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'host/cmake/redhat') 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 -- cgit v1.2.3