From 28df1feb8fa4d5f4456465328a12eeefb16e2875 Mon Sep 17 00:00:00 2001 From: Chris Freehill Date: Sat, 24 Oct 2020 21:33:43 -0500 Subject: [PATCH] Move grpc to ROCm install dir Having grpc installed outside of ROCm dir is problematic for multiple, simultaneous ROCm installations. Change-Id: I5ad458ad01a76786339607d708b48534f15b137b [ROCm/rdc commit: 0030f27ff82f291c62a81f9bc31b25ae502c6524] --- projects/rdc/CMakeLists.txt | 2 +- projects/rdc/src/DEBIAN_postinst.in | 2 +- projects/rdc/src/RPM_rpm_post.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/rdc/CMakeLists.txt b/projects/rdc/CMakeLists.txt index 8bb8736f85..eff71d1207 100755 --- a/projects/rdc/CMakeLists.txt +++ b/projects/rdc/CMakeLists.txt @@ -159,7 +159,7 @@ set(CLIENT_COMPONENT "client") install(DIRECTORY ${GRPC_ROOT} USE_SOURCE_PERMISSIONS - DESTINATION usr + DESTINATION ${RDC_CLIENT_INSTALL_PREFIX} COMPONENT ${SERVER_COMPONENT}) add_subdirectory("server") diff --git a/projects/rdc/src/DEBIAN_postinst.in b/projects/rdc/src/DEBIAN_postinst.in index 11a229a9aa..4bec5efbfa 100755 --- a/projects/rdc/src/DEBIAN_postinst.in +++ b/projects/rdc/src/DEBIAN_postinst.in @@ -1,7 +1,7 @@ #/bin/bash RDC_LIB_DIR=@RDC_CLIENT_ROOT_PATH@/rdc/lib -GRPC_LIB_DIR=/usr/grpc/lib +GRPC_LIB_DIR=@RDC_CLIENT_ROOT_PATH@/grpc/lib # This will return 0 if an id is created and non-zero if # it already exists diff --git a/projects/rdc/src/RPM_rpm_post.in b/projects/rdc/src/RPM_rpm_post.in index 644116354f..1323150aca 100755 --- a/projects/rdc/src/RPM_rpm_post.in +++ b/projects/rdc/src/RPM_rpm_post.in @@ -1,7 +1,7 @@ #!/bin/bash RDC_LIB_DIR=@RDC_CLIENT_ROOT_PATH@/rdc/lib -GRPC_LIB_DIR=/usr/grpc/lib +GRPC_LIB_DIR=@RDC_CLIENT_ROOT_PATH@/grpc/lib do_create_rdc_user() { useradd -r -s /bin/nologin rdc