From 20f853deb9bf9a4de8c4452aae3710879b734e23 Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Thu, 17 Aug 2023 01:33:12 -0500 Subject: [PATCH] RPM:DEB: replace rocm_smi with amd_smi where needed __pycache__ directory wasn't getting removed. Turns out we missed some rocm-smi renames when merging changes from it. Culprit: I695bd085d4a43b678b563b4c35f6d2e8ddfa7d7c Change-Id: Ieb0db41163af0337f1a3c06eb63a6960e6c52ff6 Signed-off-by: Galantsev, Dmitrii [ROCm/amdsmi commit: 7cd72a583d796c3620483bec592936a3d7c95f6c] --- projects/amdsmi/DEBIAN/postinst.in | 8 ++++---- projects/amdsmi/DEBIAN/prerm.in | 4 ++-- ...brocm_smi_lib.conf => x86_64-libamd_smi_lib.conf} | 0 projects/amdsmi/RPM/post.in | 12 ++++++------ projects/amdsmi/RPM/postun.in | 2 +- projects/amdsmi/RPM/preun.in | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename projects/amdsmi/DEBIAN/{x86_64-librocm_smi_lib.conf => x86_64-libamd_smi_lib.conf} (100%) diff --git a/projects/amdsmi/DEBIAN/postinst.in b/projects/amdsmi/DEBIAN/postinst.in index cb52dd1a08..a0ecb7fdb1 100755 --- a/projects/amdsmi/DEBIAN/postinst.in +++ b/projects/amdsmi/DEBIAN/postinst.in @@ -25,11 +25,11 @@ do_configureLogrotate() { if [ ! -f $logrotateConfFile ]; then sudo touch "${logrotateConfFile}" sudo chmod 644 "${logrotateConfFile}" # root r/w, all others read - # ROCm SMI logging rotation, rotates files using root user/group + # AMD SMI logging rotation, rotates files using root user/group # Hourly logrotation check # Only rotates if size grew larger than 1MB # Max of 4 rotation files, oldest will be removed - # Rotated files use date extention of ex. ROCm-SMI-lib.log.2023-05-09_16:51:42 + # Rotated files use date extention of ex. AMD-SMI-lib.log.2023-05-09_16:51:42 cat << EOF | sudo tee "${logrotateConfFile}" >/dev/null ${logFile} { su root root @@ -49,7 +49,7 @@ EOF # https://rpm-software-management.github.io/rpm/manual/spec.html sudo sed -i s/%%/%/g "${logrotateConfFile}" # workaround: remove extra 'OURCE' text - # from rocm_smi.conf. Unsure if CMAKE, + # from amd_smi.conf. Unsure if CMAKE, # bash, or here document # issue (only seen on RHEL 8.7) sudo sed -i s/OURCE//g "${logrotateConfFile}" @@ -108,7 +108,7 @@ EOF do_ldconfig() { # left-hand term originates from ENABLE_LDCONFIG = ON/OFF at package build if [ "@ENABLE_LDCONFIG@" == "ON" ]; then - echo @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ > /etc/ld.so.conf.d/x86_64-librocm_smi_lib.conf + echo @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ > /etc/ld.so.conf.d/x86_64-libamd_smi_lib.conf ldconfig fi } diff --git a/projects/amdsmi/DEBIAN/prerm.in b/projects/amdsmi/DEBIAN/prerm.in index 615428771e..2de4969580 100755 --- a/projects/amdsmi/DEBIAN/prerm.in +++ b/projects/amdsmi/DEBIAN/prerm.in @@ -28,14 +28,14 @@ return_logrotateToOrigConfig() { rm_ldconfig() { # left-hand term originates from ENABLE_LDCONFIG = ON/OFF at package build if [ "@ENABLE_LDCONFIG@" == "ON" ]; then - rm -f /etc/ld.so.conf.d/x86_64-librocm_smi_lib.conf + rm -f /etc/ld.so.conf.d/x86_64-libamd_smi_lib.conf ldconfig fi } rm_pyc() { # remove pyc file generated by python - rm -rf @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/rocm_smi/__pycache__ + rm -rf @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/amd_smi/__pycache__ } case "$1" in diff --git a/projects/amdsmi/DEBIAN/x86_64-librocm_smi_lib.conf b/projects/amdsmi/DEBIAN/x86_64-libamd_smi_lib.conf similarity index 100% rename from projects/amdsmi/DEBIAN/x86_64-librocm_smi_lib.conf rename to projects/amdsmi/DEBIAN/x86_64-libamd_smi_lib.conf diff --git a/projects/amdsmi/RPM/post.in b/projects/amdsmi/RPM/post.in index 0822d298e6..4a8ed2876c 100755 --- a/projects/amdsmi/RPM/post.in +++ b/projects/amdsmi/RPM/post.in @@ -25,11 +25,11 @@ do_configureLogrotate() { if [ ! -f $logrotateConfFile ]; then sudo touch "${logrotateConfFile}" sudo chmod 644 "${logrotateConfFile}" # root r/w, all others read - # ROCm SMI logging rotation, rotates files using root user/group + # AMD SMI logging rotation, rotates files using root user/group # Hourly logrotation check # Only rotates if size grew larger than 1MB # Max of 4 rotation files, oldest will be removed - # Rotated files use date extention of ex. ROCm-SMI-lib.log.2023-05-09_16:51:42 + # Rotated files use date extention of ex. AMD-SMI-lib.log.2023-05-09_16:51:42 cat << EOF | sudo tee "${logrotateConfFile}" >/dev/null ${logFile} { su root root @@ -49,7 +49,7 @@ EOF # https://rpm-software-management.github.io/rpm/manual/spec.html sudo sed -i s/%%/%/g "${logrotateConfFile}" # workaround: remove extra 'OURCE' text - # from rocm_smi.conf. Unsure if CMAKE, + # from amd_smi.conf. Unsure if CMAKE, # bash, or here document # issue (only seen on RHEL 8.7) sudo sed -i s/OURCE//g "${logrotateConfFile}" @@ -108,14 +108,14 @@ EOF do_ldconfig() { # left-hand term originates from ENABLE_LDCONFIG = ON/OFF at package build if [ "@ENABLE_LDCONFIG@" == "ON" ]; then - echo @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ > /etc/ld.so.conf.d/x86_64-librocm_smi_lib.conf + echo @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ > /etc/ld.so.conf.d/x86_64-libamd_smi_lib.conf ldconfig fi } # left-hand term originates from ENABLE_LDCONFIG = ON/OFF at package build if [ "@ENABLE_LDCONFIG@" == "ON" ]; then - echo -e "@CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" > /etc/ld.so.conf.d/x86_64-librocm_smi_lib.conf + echo -e "@CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" > /etc/ld.so.conf.d/x86_64-libamd_smi_lib.conf ldconfig fi @@ -123,4 +123,4 @@ fi if [ $1 -ge 1 ]; then do_addLogFolder do_configureLogrotate -fi \ No newline at end of file +fi diff --git a/projects/amdsmi/RPM/postun.in b/projects/amdsmi/RPM/postun.in index 0dd41d82d8..7b71daf8eb 100755 --- a/projects/amdsmi/RPM/postun.in +++ b/projects/amdsmi/RPM/postun.in @@ -3,6 +3,6 @@ # second term originates from ENABLE_LDCONFIG = ON/OFF at package build if [ $1 -le 1 ] && [ "@ENABLE_LDCONFIG@" == "ON" ]; then # perform the below actions for rpm remove($1=0) or upgrade($1=1) operations - rm -f /etc/ld.so.conf.d/x86_64-librocm_smi_lib.conf + rm -f /etc/ld.so.conf.d/x86_64-libamd_smi_lib.conf ldconfig fi diff --git a/projects/amdsmi/RPM/preun.in b/projects/amdsmi/RPM/preun.in index 6d42dd5a72..521c420be9 100755 --- a/projects/amdsmi/RPM/preun.in +++ b/projects/amdsmi/RPM/preun.in @@ -30,7 +30,7 @@ return_logrotateToOrigConfig() { if [ $1 -le 1 ]; then # perform the below actions for rpm remove($1=0) or upgrade($1=1) operations # remove pyc file generated by python - rm -rf @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/rocm_smi/__pycache__ + rm -rf @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/amd_smi/__pycache__ rm_logFolder return_logrotateToOrigConfig fi