From b62929a0bf4cdd9e7e8ea73c5602e5a69f196325 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Mon, 12 Nov 2018 10:13:25 -0600 Subject: [PATCH] pre/post package scripts install dir name fix and CPACK_PACKAGING_INSTALL_PREFIX Change-Id: I415875572829dadc9996dd7561418a77ec3fe1bb [ROCm/rocprofiler commit: 722fa916241dabdb54043281a1fdc437a50de53a] --- projects/rocprofiler/CMakeLists.txt | 1 + projects/rocprofiler/DEBIAN/postinst | 2 +- projects/rocprofiler/DEBIAN/prerm | 2 +- projects/rocprofiler/RPM/rpm_post | 2 +- projects/rocprofiler/RPM/rpm_postun | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/rocprofiler/CMakeLists.txt b/projects/rocprofiler/CMakeLists.txt index f35d8458f6..2cd916bb61 100644 --- a/projects/rocprofiler/CMakeLists.txt +++ b/projects/rocprofiler/CMakeLists.txt @@ -81,6 +81,7 @@ add_custom_target ( rocprof-link ALL #if ( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ) #message ( "CMAKE default prefix: ${CMAKE_INSTALL_PREFIX}" ) #endif () +set ( CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) set ( CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${ROCPROFILER_NAME}" ) message ( "---------Install-Dir: ${CMAKE_INSTALL_PREFIX}" ) install ( TARGETS ${ROCPROFILER_TARGET} LIBRARY DESTINATION lib ) diff --git a/projects/rocprofiler/DEBIAN/postinst b/projects/rocprofiler/DEBIAN/postinst index 3d0228844a..abec93b9c7 100644 --- a/projects/rocprofiler/DEBIAN/postinst +++ b/projects/rocprofiler/DEBIAN/postinst @@ -3,7 +3,7 @@ set -e do_ldconfig() { - echo /opt/rocm/librocprofiler/lib > /etc/ld.so.conf.d/libhsa-rocprofiler64.conf && ldconfig + echo /opt/rocm/rocprofiler/lib > /etc/ld.so.conf.d/librocprofiler64.conf && ldconfig } case "$1" in diff --git a/projects/rocprofiler/DEBIAN/prerm b/projects/rocprofiler/DEBIAN/prerm index b3f509a9fa..4094638306 100644 --- a/projects/rocprofiler/DEBIAN/prerm +++ b/projects/rocprofiler/DEBIAN/prerm @@ -3,7 +3,7 @@ set -e rm_ldconfig() { - rm -f /etc/ld.so.conf.d/libhsa-rocprofiler64.conf && ldconfig + rm -f /etc/ld.so.conf.d/librocprofiler64.conf && ldconfig } case "$1" in diff --git a/projects/rocprofiler/RPM/rpm_post b/projects/rocprofiler/RPM/rpm_post index 57c5c8113e..d0684561dd 100644 --- a/projects/rocprofiler/RPM/rpm_post +++ b/projects/rocprofiler/RPM/rpm_post @@ -1 +1 @@ -echo /opt/rocm/librocprofiler/lib > /etc/ld.so.conf.d/libhsa-rocprofiler64.conf && ldconfig +echo /opt/rocm/rocprofiler/lib > /etc/ld.so.conf.d/librocprofiler64.conf && ldconfig diff --git a/projects/rocprofiler/RPM/rpm_postun b/projects/rocprofiler/RPM/rpm_postun index 6b3c8f2887..b9c1fadbf2 100644 --- a/projects/rocprofiler/RPM/rpm_postun +++ b/projects/rocprofiler/RPM/rpm_postun @@ -1 +1 @@ -rm -f /etc/ld.so.conf.d/libhsa-rocprofiler64.conf && ldconfig +rm -f /etc/ld.so.conf.d/librocprofiler64.conf && ldconfig