From 62730f576a02b9fa854e1971f7d9a127d194ac4f Mon Sep 17 00:00:00 2001 From: Freddy Paul Date: Mon, 22 Nov 2021 14:53:10 -0800 Subject: [PATCH] SWDEV-306293 - Failing Ubuntu, CL-GL subtest in OpenCL conformance renaming rocm-opencl ldconfig file with "10-" prefix to prioritize over system icd loader. Change-Id: I0a54de7a0bc0e256d6470eae743ec712d1e42a36 Change-Id: I4af1d0e3e27f40f8b03b798cae43cfd4ba4a1880 [ROCm/clr commit: 3f1e2271828502e7df8048f3869e896b4cc54f90] --- projects/clr/opencl/packaging/rocm-opencl.postinst | 2 +- projects/clr/opencl/packaging/rocm-opencl.rpm_post | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/opencl/packaging/rocm-opencl.postinst b/projects/clr/opencl/packaging/rocm-opencl.postinst index c304ac4a28..0780970ce2 100644 --- a/projects/clr/opencl/packaging/rocm-opencl.postinst +++ b/projects/clr/opencl/packaging/rocm-opencl.postinst @@ -6,7 +6,7 @@ INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@ ROCM_LIBPATH=@ROCM_PATH@/lib do_ldconfig() { - echo ${INSTALL_PATH}/lib > /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig + echo ${INSTALL_PATH}/lib > /etc/ld.so.conf.d/10-rocm-opencl.conf && ldconfig mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) } diff --git a/projects/clr/opencl/packaging/rocm-opencl.rpm_post b/projects/clr/opencl/packaging/rocm-opencl.rpm_post index 250b248403..7ce5d9723d 100644 --- a/projects/clr/opencl/packaging/rocm-opencl.rpm_post +++ b/projects/clr/opencl/packaging/rocm-opencl.rpm_post @@ -1,7 +1,7 @@ INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@ ROCM_LIBPATH=@ROCM_PATH@/lib -echo ${INSTALL_PATH}/lib > /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig +echo ${INSTALL_PATH}/lib > /etc/ld.so.conf.d/10-rocm-opencl.conf && ldconfig mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) mkdir -p ${ROCM_LIBPATH}