From 91baa9ded633cccd9f45cbd41617cfc317de04ea Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Tue, 7 Dec 2021 09:59:03 -0500 Subject: [PATCH] SWDEV-306293 - fix regression in cleanup To fix SWDEV-306293, x86_64-rocm-opencl.conf was renamed to 10-rocm-opencl.conf. This was not changes in the clean up, only in the creation, so the patch causes a regression by not cleaning up the new filename. Signed-off-by: Jeremy Newton Change-Id: I4aa456955f6f7c2d52a3560e5e792537f95add17 [ROCm/clr commit: e885ae959140fcd4f31c700c851e5a4f660a70df] --- projects/clr/opencl/packaging/rocm-opencl.prerm | 2 +- projects/clr/opencl/packaging/rocm-opencl.rpm_postun | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/opencl/packaging/rocm-opencl.prerm b/projects/clr/opencl/packaging/rocm-opencl.prerm index 927973f727..9fc6c8d8ff 100644 --- a/projects/clr/opencl/packaging/rocm-opencl.prerm +++ b/projects/clr/opencl/packaging/rocm-opencl.prerm @@ -3,7 +3,7 @@ set -e rm_ldconfig() { - rm -f /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig + rm -f /etc/ld.so.conf.d/10-rocm-opencl.conf && ldconfig rm -f /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@ } diff --git a/projects/clr/opencl/packaging/rocm-opencl.rpm_postun b/projects/clr/opencl/packaging/rocm-opencl.rpm_postun index 7cc5860de7..356c7af3df 100644 --- a/projects/clr/opencl/packaging/rocm-opencl.rpm_postun +++ b/projects/clr/opencl/packaging/rocm-opencl.rpm_postun @@ -1,5 +1,5 @@ if [ $1 -eq 0 ]; then - rm -f /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig + rm -f /etc/ld.so.conf.d/10-rocm-opencl.conf && ldconfig rm -f /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@ rm -f @ROCM_PATH@/lib/libOpenCL.so rm -f @ROCM_PATH@/lib/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@