commit: ed9e657e6f7e5dcabbf217c003815a553857ea5d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Oct 15 21:11:11 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 18:11:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9e657e
dev-util/rocm-smi: drop 5.7.1-r3, 6.1.1, 6.3.2, 6.4.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/rocm-smi/Manifest | 4 - .../rocm-smi-5.4.2-detect-builtin-amdgpu.patch | 26 ---- .../files/rocm-smi-5.4.2-fix-readonly-object.patch | 14 -- .../files/rocm-smi-5.7.1-set-soversion.patch | 130 ---------------- .../files/rocm-smi-6.0.2-set-soversion.patch | 165 --------------------- .../files/rocm-smi-6.1.1-fix-const-qualifier.patch | 13 -- .../files/rocm-smi-6.4.1-set-soversion.patch | 106 ------------- dev-util/rocm-smi/rocm-smi-5.7.1-r3.ebuild | 61 -------- dev-util/rocm-smi/rocm-smi-6.1.1.ebuild | 59 -------- dev-util/rocm-smi/rocm-smi-6.3.2.ebuild | 60 -------- dev-util/rocm-smi/rocm-smi-6.4.1.ebuild | 71 --------- 11 files changed, 709 deletions(-) diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest index 99874b295f81..9d3f55308319 100644 --- a/dev-util/rocm-smi/Manifest +++ b/dev-util/rocm-smi/Manifest @@ -1,6 +1,2 @@ -DIST rocm-smi-5.7.1.tar.gz 801646 BLAKE2B b4799bbdaeb7203c16117cd30511d589a2b96e15801bb9f1382fe7a4d87d43e1d4b458d6923b6ebd602fdccba74bd65bcb98766dbd83c48fc3e02219be8c1022 SHA512 ad364278f137228a39108c93d482635137ea2724a5a39debb5b32329493ebf5c706dcf3863e2e24b6f0b6286f3877942277f5ae447446f155518972b957f7d9d -DIST rocm-smi-6.1.1.tar.gz 872628 BLAKE2B 35830fd0eb36688b3803bed2059f29ba4d8613112ae4cfff2e0a3b1d7afef9f0d77ec16771e2205ba351df0aa678c3b0d2436940b76d10d020f1a30d14d760e9 SHA512 3e31ff0d94e7f0ea650c985973b27107e3f7293b92857fbf2fe196b61632c530e95c3228ad7550d44f8ee9f5f1abfd17e5c2b19164759728fb6d4b0995455fa7 -DIST rocm-smi-6.3.2.tar.gz 902982 BLAKE2B 8b9f544d7ab66a8728f8e8fa0e217e2177fc8666c5cce47cdd59246c2309feedb63f59894fa53d5433acd462e5274826d411d5b052f6f61291e76516d3bf4dd5 SHA512 bdd7825a1147452cc9927d446cfb1f10ffa34fb63bdbb842e8e0f6a2126c3a2855e5bca2e6663c103f4b13d46656190b14d13aee3cf1a2f967f72305f15ce338 DIST rocm-smi-6.3.3.tar.gz 902980 BLAKE2B 8a8f80c4fb5485dc65b340ba4da2bb73061b989757ca6147d7d401dcbdbba5edbd1f68de78f66adcc5a6611a8ce870dfea6cbc31863918d6da9e9a7cb812746b SHA512 0f722effb404f605bef08f22eb4c4ecfb076ee10d112daf6a82f81d78e5279a185f497919b2d9ea414236761d1fa52231a6168a156f33b7f47a93857e30d7449 -DIST rocm-smi-6.4.1.tar.gz 934699 BLAKE2B 418ea7680118cf78f4ab9c8eaa8897360815519bdb0877e095fa7c5abe0d2e6c7db1d63098b8f75613e4fae9107d5581bfe7afd7fecef76f56de9231ce5d59ce SHA512 e8701f8746a48ebd6a22e919f14219e02992840003183e85811b4c94c7330efb1c487e8767a6504f4240fbbdc397b3e4e6a9ce0527e9635eb1bb944f412a8345 DIST rocm-smi-6.4.3.tar.gz 934885 BLAKE2B b7e5ee132cd9f3b9f36791df7feec77186fdb170ee62acfb2c494b8960caef8815a6c220cc517e567e7045ad0353e7ff773185808e963b597854199a23c96450 SHA512 034a5e6d672d88e9a138d862fbafa5552c80638795c791f955258d0fc917a02e4aabd954154ad457eb2ba1a59c4e54f5702635ceb757165c212856068580a72d diff --git a/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch b/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch deleted file mode 100644 index 1c406c7d042c..000000000000 --- a/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch +++ /dev/null @@ -1,26 +0,0 @@ -Detect amdgpu module for amdgpu-builtin kernel -From dc2a4b5b256692e1a6ecef45210682c316b961e0 Mon Sep 17 00:00:00 2001 -From: YiyangWu <[email protected]> -Date: Sat, 2 Apr 2022 16:40:11 +0800 -Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod - -Closes: #102 - -Signed-off-by: YiyangWu <[email protected]> ---- - python_smi_tools/rocm_smi.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py -=================================================================== ---- rocm_smi_lib-rocm-5.4.2.orig/python_smi_tools/rocm_smi.py -+++ rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py -@@ -66,7 +66,7 @@ def driverInitialized(): - """ - driverInitialized = '' - try: -- driverInitialized = str(subprocess.check_output("cat /sys/module/amdgpu/initstate |grep live", shell=True)) -+ driverInitialized = str(subprocess.check_output("test -d /sys/module/amdgpu", shell=True)) - except subprocess.CalledProcessError: - pass - if len(driverInitialized) > 0: diff --git a/dev-util/rocm-smi/files/rocm-smi-5.4.2-fix-readonly-object.patch b/dev-util/rocm-smi/files/rocm-smi-5.4.2-fix-readonly-object.patch deleted file mode 100644 index 914fd2f6b426..000000000000 --- a/dev-util/rocm-smi/files/rocm-smi-5.4.2-fix-readonly-object.patch +++ /dev/null @@ -1,14 +0,0 @@ -bug https://bugs.gentoo.org/918709 -patch from https://github.com/ROCm/rocm_smi_lib/issues/170#issuecomment-2130745220 -upstreamed in https://github.com/ROCm/rocm_smi_lib/commit/7fdc6e56c40ed6f02c888dcb1492944a9373ba74 ---- a/include/rocm_smi/rocm_smi_utils.h 2024-05-25 00:02:19.127412816 -0400 -+++ b/include/rocm_smi/rocm_smi_utils.h 2024-05-25 00:03:25.359416227 -0400 -@@ -149,7 +149,7 @@ - __forceinline ~ScopeGuard() { - if (!dismiss_) release_(); - } -- __forceinline ScopeGuard& operator=(const ScopeGuard& rhs) { -+ __forceinline ScopeGuard& operator=(ScopeGuard& rhs) { - dismiss_ = rhs.dismiss_; - release_ = rhs.release_; - rhs.dismiss_ = true; diff --git a/dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch b/dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch deleted file mode 100644 index f79276d7ab8d..000000000000 --- a/dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch +++ /dev/null @@ -1,130 +0,0 @@ -Forcefully set rocm_smi64 soversion to 1. -Before intoduction of git-based versioning, soversion was 1.0. - -This patch repeats approach of similar patch from Debian, additionally removing dependency from git. -https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/0007-rocm_smi64-soversion.patch ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,18 +30,6 @@ set(SHARE_INSTALL_PREFIX - "share/${ROCM_SMI}" - CACHE STRING "Tests and Example install directory") - --# provide git to utilities --find_program (GIT NAMES git) -- --## Setup the package version based on git tags. --set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver") --get_package_version_number("5.0.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) --message("Package version: ${PKG_VERSION_STR}") --set(${AMD_SMI_LIBS_TARGET}_VERSION_MAJOR "${VERSION_MAJOR}") --set(${AMD_SMI_LIBS_TARGET}_VERSION_MINOR "${VERSION_MINOR}") --set(${AMD_SMI_LIBS_TARGET}_VERSION_PATCH "0") --set(${AMD_SMI_LIBS_TARGET}_VERSION_BUILD "0") -- - # The following default version values should be updated as appropriate for - # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR). - # Until ABI stabilizes VERSION_MAJOR will be 0. This should be over-ridden ---- a/oam/CMakeLists.txt -+++ b/oam/CMakeLists.txt -@@ -29,23 +29,11 @@ set(OAM_NAME "oam") - set(OAM_COMPONENT "lib${OAM_NAME}") - set(OAM_TARGET "${OAM_NAME}") - --################# Determine the library version ######################### --set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver") -- --# VERSION_* variables should be set by get_version_from_tag --message("Package version: ${PKG_VERSION_STR}") -- --# Debian package specific variables --# Set a default value for the package version --get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) -- --# VERSION_* variables should be set by get_version_from_tag --if ( ${ROCM_PATCH_VERSION} ) -- set ( VERSION_PATCH ${ROCM_PATCH_VERSION}) -- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") --else() -- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}") --endif () -+set(VERSION_MAJOR "@VERSION_MAJOR@") -+set(VERSION_MINOR "@VERSION_MINOR@") -+ -+set(SO_VERSION_MAJOR "1") -+set(SO_VERSION_STRING "1.0") - set(${OAM_NAME}_VERSION_MAJOR "${VERSION_MAJOR}") - set(${OAM_NAME}_VERSION_MINOR "${VERSION_MINOR}") - set(${OAM_NAME}_VERSION_PATCH "0") -@@ -78,7 +66,7 @@ target_include_directories(${OAM_TARGET} PRIVATE - - ## Set the VERSION and SOVERSION values - set_property(TARGET ${OAM_TARGET} PROPERTY -- SOVERSION "${VERSION_MAJOR}") -+ SOVERSION "${SO_VERSION_MAJOR}") - set_property(TARGET ${OAM_TARGET} PROPERTY - VERSION "${SO_VERSION_STRING}") - ---- a/python_smi_tools/rsmiBindings.py.in -+++ b/python_smi_tools/rsmiBindings.py.in -@@ -9,19 +9,9 @@ from enum import Enum - - import os - --# Use ROCm installation path if running from standard installation --# With File Reorg rsmiBindings.py will be installed in /opt/rocm/libexec/rocm_smi. --# relative path changed accordingly --path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@' --if not os.path.isfile(path_librocm): -- print('Unable to find %s . Trying /opt/rocm*' % path_librocm) -- for root, dirs, files in os.walk('/opt', followlinks=True): -- if 'librocm_smi64.so.@VERSION_MAJOR@' in files: -- path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@') -- if os.path.isfile(path_librocm): -- print('Using lib from %s' % path_librocm) -- else: -- print('Unable to find librocm_smi64.so.@VERSION_MAJOR@') -+path_librocm = ctypes.util.find_library("rocm_smi64") -+if not path_librocm: -+ print('Unable to find librocm_smi64.so') - - # ----------> TODO: Support static libs as well as SO - ---- a/rocm_smi/CMakeLists.txt -+++ b/rocm_smi/CMakeLists.txt -@@ -31,23 +31,10 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64") - ## Include common cmake modules - include(utils) - --################# Determine the library version ######################### --set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver") -- --# VERSION_* variables should be set by get_version_from_tag --message("Package version: ${PKG_VERSION_STR}") -- --# Debian package specific variables --# Set a default value for the package version --get_version_from_tag("5.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) -- --# VERSION_* variables should be set by get_version_from_tag --if ( ${ROCM_PATCH_VERSION} ) -- set ( VERSION_PATCH ${ROCM_PATCH_VERSION}) -- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") --else() -- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}") --endif () -+set(VERSION_MAJOR "@VERSION_MAJOR@") -+set(VERSION_MINOR "@VERSION_MINOR@") -+set(SO_VERSION_MAJOR "1") -+set(SO_VERSION_STRING "1.0") - set(${ROCM_SMI}_VERSION_MAJOR "${VERSION_MAJOR}") - set(${ROCM_SMI}_VERSION_MINOR "${VERSION_MINOR}") - set(${ROCM_SMI}_VERSION_PATCH "0") -@@ -99,7 +86,7 @@ endif() - - ## Set the VERSION and SOVERSION values - set_property(TARGET ${ROCM_SMI_TARGET} PROPERTY -- SOVERSION "${VERSION_MAJOR}") -+ SOVERSION "${SO_VERSION_MAJOR}") - set_property(TARGET ${ROCM_SMI_TARGET} PROPERTY - VERSION "${SO_VERSION_STRING}") - diff --git a/dev-util/rocm-smi/files/rocm-smi-6.0.2-set-soversion.patch b/dev-util/rocm-smi/files/rocm-smi-6.0.2-set-soversion.patch deleted file mode 100644 index 6d28c7bb8e3e..000000000000 --- a/dev-util/rocm-smi/files/rocm-smi-6.0.2-set-soversion.patch +++ /dev/null @@ -1,165 +0,0 @@ -Switch from extracting version with git to version from ebuild filename. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,20 +33,17 @@ set(SHARE_INSTALL_PREFIX - "share/${ROCM_SMI}" - CACHE STRING "Tests and Example install directory") - --# provide git to utilities --find_program (GIT NAMES git) -- --## Setup the package version based on git tags. --set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver") --get_package_version_number("7.0.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) --message("Package version: ${PKG_VERSION_STR}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_BUILD "0") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_HASH "${PKG_VERSION_HASH}") -- --set(${ROCM_SMI_LIBS_TARGET}_VERSION_STRING "${${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH}+${${ROCM_SMI_LIBS_TARGET}_VERSION_HASH}") -+set(VERSION_MAJOR "@VERSION_MAJOR@") -+set(VERSION_MINOR "@VERSION_MINOR@") -+set(VERSION_PATCH "@VERSION_PATCH@") -+set(PKG_VERSION_STR "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -+set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}") -+set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") -+set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") -+set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}") -+set(rocm_smi_VERSION_MAJOR "${VERSION_MAJOR}") -+set(rocm_smi_VERSION_MINOR "${VERSION_MINOR}") -+set(rocm_smi_VERSION_PATCH "${VERSION_PATCH}") - - # The following default version values should be updated as appropriate for - # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR). ---- a/oam/CMakeLists.txt -+++ b/oam/CMakeLists.txt -@@ -29,17 +29,6 @@ set(OAM_NAME "oam") - set(OAM_COMPONENT "lib${OAM_NAME}") - set(OAM_TARGET "${OAM_NAME}") - --################# Determine the library version ######################### --set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver") -- --# VERSION_* variables should be set by get_version_from_tag --message("Package version: ${PKG_VERSION_STR}") -- --# Debian package specific variables --# Set a default value for the package version --get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) -- --# VERSION_* variables should be set by get_version_from_tag - if ( ${ROCM_PATCH_VERSION} ) - set ( VERSION_PATCH ${ROCM_PATCH_VERSION}) - set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") ---- a/python_smi_tools/rsmiBindings.py -+++ b/python_smi_tools/rsmiBindings.py -@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False): - if (rocm_smi_lib_path != None): - path_librocm = rocm_smi_lib_path - else: -- path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../lib/librocm_smi64.so.7' -- -- if not os.path.isfile(path_librocm): -- print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm) -- for root, dirs, files in os.walk('/opt', followlinks=True): -- if 'librocm_smi64.so.7' in files: -- path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.7') -- if os.path.isfile(path_librocm): -- print_silent('Using lib from %s' % path_librocm) -- else: -- print('Unable to find librocm_smi64.so.7') -+ path_librocm = 'librocm_smi64.so' - - # ----------> TODO: Support static libs as well as SO - try: -@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False): - return CDLL(path_librocm) - except OSError: - print('Unable to load the rocm_smi library.\n'\ -- 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.7\n'\ -+ 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\ - '{0}Please refer to https://github.com/'\ - 'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\ - .format('\33[33m', '\033[0m')) ---- a/python_smi_tools/rsmiBindings.py.in -+++ b/python_smi_tools/rsmiBindings.py.in -@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False): - if (rocm_smi_lib_path != None): - path_librocm = rocm_smi_lib_path - else: -- path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@' -- -- if not os.path.isfile(path_librocm): -- print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm) -- for root, dirs, files in os.walk('/opt', followlinks=True): -- if 'librocm_smi64.so.@VERSION_MAJOR@' in files: -- path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@') -- if os.path.isfile(path_librocm): -- print_silent('Using lib from %s' % path_librocm) -- else: -- print('Unable to find librocm_smi64.so.@VERSION_MAJOR@') -+ path_librocm = 'librocm_smi64.so' - - # ----------> TODO: Support static libs as well as SO - try: -@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False): - return CDLL(path_librocm) - except OSError: - print('Unable to load the rocm_smi library.\n'\ -- 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.@VERSION_MAJOR@\n'\ -+ 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\ - '{0}Please refer to https://github.com/'\ - 'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\ - .format('\33[33m', '\033[0m')) ---- a/python_smi_tools/rsmiBindingsInit.py.in -+++ b/python_smi_tools/rsmiBindingsInit.py.in -@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False): - if (rocm_smi_lib_path != None): - path_librocm = rocm_smi_lib_path - else: -- path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@' -- -- if not os.path.isfile(path_librocm): -- print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm) -- for root, dirs, files in os.walk('/opt', followlinks=True): -- if 'librocm_smi64.so.@VERSION_MAJOR@' in files: -- path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@') -- if os.path.isfile(path_librocm): -- print_silent('Using lib from %s' % path_librocm) -- else: -- print('Unable to find librocm_smi64.so.@VERSION_MAJOR@') -+ path_librocm = 'librocm_smi64.so' - - # ----------> TODO: Support static libs as well as SO - try: -@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False): - return CDLL(path_librocm) - except OSError: - print('Unable to load the rocm_smi library.\n'\ -- 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.@VERSION_MAJOR@\n'\ -+ 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\ - '{0}Please refer to https://github.com/'\ - 'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\ - .format('\33[33m', '\033[0m')) ---- a/rocm_smi/CMakeLists.txt -+++ b/rocm_smi/CMakeLists.txt -@@ -31,17 +31,6 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64") - ## Include common cmake modules - include(utils) - --################# Determine the library version ######################### --set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver") -- --# VERSION_* variables should be set by get_version_from_tag --message("Package version: ${PKG_VERSION_STR}") -- --# Debian package specific variables --# Set a default value for the package version --get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) -- --# VERSION_* variables should be set by get_version_from_tag - if ( ${ROCM_PATCH_VERSION} ) - set ( VERSION_PATCH ${ROCM_PATCH_VERSION}) - set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") diff --git a/dev-util/rocm-smi/files/rocm-smi-6.1.1-fix-const-qualifier.patch b/dev-util/rocm-smi/files/rocm-smi-6.1.1-fix-const-qualifier.patch deleted file mode 100644 index 6c4197091575..000000000000 --- a/dev-util/rocm-smi/files/rocm-smi-6.1.1-fix-const-qualifier.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix error "cannot assign to variable 'rhs' with const-qualified type" -PR: https://github.com/ROCm/rocm_smi_lib/pull/156 ---- a/include/rocm_smi/rocm_smi_utils.h -+++ b/include/rocm_smi/rocm_smi_utils.h -@@ -216,7 +216,7 @@ class ScopeGuard { - __forceinline ~ScopeGuard() { - if (!dismiss_) release_(); - } -- __forceinline ScopeGuard& operator=(const ScopeGuard& rhs) { -+ __forceinline ScopeGuard& operator=(ScopeGuard& rhs) { - dismiss_ = rhs.dismiss_; - release_ = rhs.release_; - rhs.dismiss_ = true; diff --git a/dev-util/rocm-smi/files/rocm-smi-6.4.1-set-soversion.patch b/dev-util/rocm-smi/files/rocm-smi-6.4.1-set-soversion.patch deleted file mode 100644 index 1d07aca0b77a..000000000000 --- a/dev-util/rocm-smi/files/rocm-smi-6.4.1-set-soversion.patch +++ /dev/null @@ -1,106 +0,0 @@ -Switch from extracting version with git to version from ebuild filename. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,21 +38,17 @@ set(SHARE_INSTALL_PREFIX - "share/${ROCM_SMI}" - CACHE STRING "Tests and Example install directory") - --# provide git to utilities --find_program (GIT NAMES git) -- -- --## Setup the package version based on git tags. --set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver") --get_package_version_number("7.6.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) --message("Package version: ${PKG_VERSION_STR}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_BUILD "0") --set(${ROCM_SMI_LIBS_TARGET}_VERSION_HASH "${PKG_VERSION_HASH}") -- --set(${ROCM_SMI_LIBS_TARGET}_VERSION_STRING "${${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH}+${${ROCM_SMI_LIBS_TARGET}_VERSION_HASH}") -+set(VERSION_MAJOR "@VERSION_MAJOR@") -+set(VERSION_MINOR "@VERSION_MINOR@") -+set(VERSION_PATCH "@VERSION_PATCH@") -+set(PKG_VERSION_STR "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -+set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}") -+set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") -+set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") -+set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}") -+set(rocm_smi_VERSION_MAJOR "${VERSION_MAJOR}") -+set(rocm_smi_VERSION_MINOR "${VERSION_MINOR}") -+set(rocm_smi_VERSION_PATCH "${VERSION_PATCH}") - - # The following default version values should be updated as appropriate for - # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR). ---- a/oam/CMakeLists.txt -+++ b/oam/CMakeLists.txt -@@ -29,17 +29,6 @@ set(OAM_NAME "oam") - set(OAM_COMPONENT "lib${OAM_NAME}") - set(OAM_TARGET "${OAM_NAME}") - --################# Determine the library version ######################### --set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver") -- --# VERSION_* variables should be set by get_version_from_tag --message("Package version: ${PKG_VERSION_STR}") -- --# Debian package specific variables --# Set a default value for the package version --get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) -- --# VERSION_* variables should be set by get_version_from_tag - if ( ${ROCM_PATCH_VERSION} ) - set ( VERSION_PATCH ${ROCM_PATCH_VERSION}) - set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") ---- a/python_smi_tools/rsmiBindingsInit.py.in -+++ b/python_smi_tools/rsmiBindingsInit.py.in -@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False): - if (rocm_smi_lib_path != None): - path_librocm = rocm_smi_lib_path - else: -- path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@' -- -- if not os.path.isfile(path_librocm): -- print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm) -- for root, dirs, files in os.walk('/opt', followlinks=True): -- if 'librocm_smi64.so.@VERSION_MAJOR@' in files: -- path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@') -- if os.path.isfile(path_librocm): -- print_silent('Using lib from %s' % path_librocm) -- else: -- print('Unable to find librocm_smi64.so.@VERSION_MAJOR@') -+ path_librocm = 'librocm_smi64.so' - - # ----------> TODO: Support static libs as well as SO - try: -@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False): - return CDLL(path_librocm) - except OSError: - print('Unable to load the rocm_smi library.\n'\ -- 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.@VERSION_MAJOR@\n'\ -+ 'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\ - '{0}Please refer to https://github.com/'\ - 'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\ - .format('\33[33m', '\033[0m')) ---- a/rocm_smi/CMakeLists.txt -+++ b/rocm_smi/CMakeLists.txt -@@ -31,17 +31,6 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64") - ## Include common cmake modules - include(utils) - --################# Determine the library version ######################### --set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver") -- --# VERSION_* variables should be set by get_version_from_tag --message("Package version: ${PKG_VERSION_STR}") -- --# Debian package specific variables --# Set a default value for the package version --get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) -- --# VERSION_* variables should be set by get_version_from_tag - if ( ${ROCM_PATCH_VERSION} ) - set ( VERSION_PATCH ${ROCM_PATCH_VERSION}) - set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") diff --git a/dev-util/rocm-smi/rocm-smi-5.7.1-r3.ebuild b/dev-util/rocm-smi/rocm-smi-5.7.1-r3.ebuild deleted file mode 100644 index 9d1d975d0e84..000000000000 --- a/dev-util/rocm-smi/rocm-smi-5.7.1-r3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake python-r1 - -DESCRIPTION="ROCm System Management Interface Library" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"; - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib"; - EGIT_BRANCH="master" -else - SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" -fi - -LICENSE="MIT NCSA-AMD" -SLOT="0/$(ver_cut 1-2)" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" - -S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.7.1-set-soversion.patch - "${FILESDIR}"/${PN}-5.7.1-no-strip.patch - "${FILESDIR}"/${PN}-5.7.1-remove-example.patch - "${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch - "${FILESDIR}"/${PN}-5.4.2-fix-readonly-object.patch -) - -src_prepare() { - cmake_src_prepare - - sed "s/\${PKG_VERSION_STR}/${PV}/" -i CMakeLists.txt || die - sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/ ; s/@VERSION_MINOR@/$(ver_cut 2)/" \ - -i oam/CMakeLists.txt -i rocm_smi/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi - python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py - - mv "${ED}"/usr/share/doc/rocm_smi "${ED}"/usr/share/doc/${PF} || die -} diff --git a/dev-util/rocm-smi/rocm-smi-6.1.1.ebuild b/dev-util/rocm-smi/rocm-smi-6.1.1.ebuild deleted file mode 100644 index 056dd80b453a..000000000000 --- a/dev-util/rocm-smi/rocm-smi-6.1.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit cmake python-r1 - -DESCRIPTION="ROCm System Management Interface Library" -HOMEPAGE="https://github.com/ROCm/rocm_smi_lib"; - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ROCm/rocm_smi_lib"; - EGIT_BRANCH="master" -else - SRC_URI="https://github.com/ROCm/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" -fi - -LICENSE="MIT NCSA-AMD" -SLOT="0/$(ver_cut 1-2)" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.7.1-no-strip.patch - "${FILESDIR}"/${PN}-5.7.1-remove-example.patch - "${FILESDIR}"/${PN}-6.0.2-set-soversion.patch - "${FILESDIR}"/${PN}-6.1.1-fix-const-qualifier.patch -) - -src_prepare() { - cmake_src_prepare - - sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/" \ - -e "s/@VERSION_MINOR@/$(ver_cut 2)/" \ - -e "s/@VERSION_PATCH@/$(ver_cut 3)/" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi - python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py - - mv "${ED}"/usr/share/doc/rocm_smi "${ED}"/usr/share/doc/${PF} || die -} diff --git a/dev-util/rocm-smi/rocm-smi-6.3.2.ebuild b/dev-util/rocm-smi/rocm-smi-6.3.2.ebuild deleted file mode 100644 index 4a1ad124924b..000000000000 --- a/dev-util/rocm-smi/rocm-smi-6.3.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} python3_13t ) - -inherit cmake python-r1 - -DESCRIPTION="ROCm System Management Interface Library" -HOMEPAGE="https://github.com/ROCm/rocm_smi_lib"; - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ROCm/rocm_smi_lib"; - EGIT_BRANCH="master" -else - SRC_URI="https://github.com/ROCm/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.7.1-no-strip.patch - "${FILESDIR}"/${PN}-5.7.1-remove-example.patch - "${FILESDIR}"/${PN}-6.3.0-set-soversion.patch - "${FILESDIR}"/${PN}-6.3.0-fix-flags.patch -) - -src_prepare() { - cmake_src_prepare - - sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/" \ - -e "s/@VERSION_MINOR@/$(ver_cut 2)/" \ - -e "s/@VERSION_PATCH@/$(ver_cut 3)/" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi - python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py - python_foreach_impl python_domodule python_smi_tools/rsmiBindingsInit.py - - mv "${ED}"/usr/share/doc/rocm_smi "${ED}/usr/share/doc/${PF}" || die -} diff --git a/dev-util/rocm-smi/rocm-smi-6.4.1.ebuild b/dev-util/rocm-smi/rocm-smi-6.4.1.ebuild deleted file mode 100644 index d8973d3c89e5..000000000000 --- a/dev-util/rocm-smi/rocm-smi-6.4.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} python3_13t ) - -inherit cmake linux-info optfeature python-r1 - -DESCRIPTION="ROCm System Management Interface Library" -HOMEPAGE="https://github.com/ROCm/rocm_smi_lib"; - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ROCm/rocm_smi_lib"; - EGIT_BRANCH="master" -else - SRC_URI="https://github.com/ROCm/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND} - sys-kernel/linux-headers - x11-libs/libdrm -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.7.1-no-strip.patch - "${FILESDIR}"/${PN}-5.7.1-remove-example.patch - "${FILESDIR}"/${PN}-6.4.1-set-soversion.patch - "${FILESDIR}"/${PN}-6.3.0-fix-flags.patch - "${FILESDIR}"/${PN}-6.4.1-log-exceptions.patch -) - -CONFIG_CHECK="~HSA_AMD ~DRM_AMDGPU" - -src_prepare() { - cmake_src_prepare - - sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/" \ - -e "s/@VERSION_MINOR@/$(ver_cut 2)/" \ - -e "s/@VERSION_PATCH@/$(ver_cut 3)/" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi - python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py - python_foreach_impl python_domodule python_smi_tools/rsmiBindingsInit.py - - mv "${ED}"/usr/share/doc/rocm_smi "${ED}/usr/share/doc/${PF}" || die -} - -pkg_postinst() { - optfeature "vendor and device names instead of hex device IDs" sys-apps/hwdata -}
