From 0f5c2f0ba81decd053c662ae799f0a77d723abff Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Sun, 6 Nov 2022 19:16:28 -0800 Subject: [PATCH] SWDEV-310152 - Remove ldconfig from rocm-ocl-icd package ldconfig functionality moved from rocm-ocl-icd to rocm-core package Depends-On: I1148fb36240c2e63994743ccf135e51e90695c37 Depends-On: I7ba908865187d578c273b20bf31a08a3458fbbfb Change-Id: I4769c31df12fa3f1bb8baa283e0647ce9254e594 --- opencl/packaging/rocm-ocl-icd.postinst | 9 +-------- opencl/packaging/rocm-ocl-icd.prerm | 7 +------ opencl/packaging/rocm-ocl-icd.rpm_post | 5 +---- opencl/packaging/rocm-ocl-icd.rpm_postun | 6 +----- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/opencl/packaging/rocm-ocl-icd.postinst b/opencl/packaging/rocm-ocl-icd.postinst index e22be0df9c..5a8e6c33e9 100644 --- a/opencl/packaging/rocm-ocl-icd.postinst +++ b/opencl/packaging/rocm-ocl-icd.postinst @@ -2,19 +2,12 @@ set -e -INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@ - -do_ldconfig() { - echo ${INSTALL_PATH}/@CMAKE_INSTALL_LIBDIR@ > /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/10-rocm-opencl.conf && ldconfig - mkdir -p /@CMAKE_INSTALL_SYSCONFDIR@/OpenCL/vendors && (echo libamdocl64.so > /@CMAKE_INSTALL_SYSCONFDIR@/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) -} - case "$1" in abort-deconfigure|abort-remove|abort-upgrade) echo "$1" ;; configure) - do_ldconfig + mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) ;; *) exit 0 diff --git a/opencl/packaging/rocm-ocl-icd.prerm b/opencl/packaging/rocm-ocl-icd.prerm index 4843048571..a5127e6d9c 100644 --- a/opencl/packaging/rocm-ocl-icd.prerm +++ b/opencl/packaging/rocm-ocl-icd.prerm @@ -2,16 +2,11 @@ set -e -rm_ldconfig() { - rm -f /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/10-rocm-opencl.conf && ldconfig - rm -f /@CMAKE_INSTALL_SYSCONFDIR@/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@ -} - case "$1" in purge) ;; remove | upgrade ) - rm_ldconfig + rm -f /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@ ;; *) exit 0 diff --git a/opencl/packaging/rocm-ocl-icd.rpm_post b/opencl/packaging/rocm-ocl-icd.rpm_post index b467f63ba8..d485d683e2 100644 --- a/opencl/packaging/rocm-ocl-icd.rpm_post +++ b/opencl/packaging/rocm-ocl-icd.rpm_post @@ -1,4 +1 @@ -INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@ - -echo ${INSTALL_PATH}/@CMAKE_INSTALL_LIBDIR@ > /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/10-rocm-opencl.conf && ldconfig -mkdir -p /@CMAKE_INSTALL_SYSCONFDIR@/OpenCL/vendors && (echo libamdocl64.so > /@CMAKE_INSTALL_SYSCONFDIR@/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) +mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) diff --git a/opencl/packaging/rocm-ocl-icd.rpm_postun b/opencl/packaging/rocm-ocl-icd.rpm_postun index f3655dfe90..2776b70010 100644 --- a/opencl/packaging/rocm-ocl-icd.rpm_postun +++ b/opencl/packaging/rocm-ocl-icd.rpm_postun @@ -1,8 +1,4 @@ -if [ $1 -eq 0 ]; then - # Remove rocm-opencl.conf during remove/uninstall operation - rm -f /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/10-rocm-opencl.conf && ldconfig -fi # Remove icd file for uninstall and upgrade operation -rm -f /@CMAKE_INSTALL_SYSCONFDIR@/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@ +rm -f /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@