diff options
Diffstat (limited to 'dev-util/rocm-smi')
| -rw-r--r-- | dev-util/rocm-smi/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch | 64 | ||||
| -rw-r--r-- | dev-util/rocm-smi/rocm-smi-5.7.1-r1.ebuild (renamed from dev-util/rocm-smi/rocm-smi-5.7.1.ebuild) | 5 |
3 files changed, 46 insertions, 27 deletions
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest index 2637b1b5e441..072bf6557d98 100644 --- a/dev-util/rocm-smi/Manifest +++ b/dev-util/rocm-smi/Manifest @@ -3,12 +3,12 @@ AUX rocm-smi-5.1.3-detect-builtin-amdgpu.patch 983 BLAKE2B c1d926ce5ce1bef272f71 AUX rocm-smi-5.4.2-detect-builtin-amdgpu.patch 1071 BLAKE2B 1957d49b0c3c1f9db24add59b8dd464c6ce8571ded2601cb259a0686938e4fb718b6affd99c366f6e8aa360f53034c0e7c231dd3518bcab84bb8d5a755c4ebb5 SHA512 a531b3ae4b73dcd03e6f3de3da4dbf1250e6a6d05ec052fa8ff412f65233b5fcd418a7128f9b913aa71e1bbf970ba5b74c7b407a0654e1030f695e7f13ebd5dc AUX rocm-smi-5.7.1-no-strip.patch 1405 BLAKE2B 703eafdfe552afe3d2d4d67af2e847b42669b09b8b553b7a77e46f39f3a960174380187f5927b3a4c686dded54b4d9fa6be6c5c862ea2a023bf84224de3be5b6 SHA512 60806893c6ae7fe4c66ae927528f0db13c75f74c464885a251ac5e021bf61aaa5f529cca3de72c9c49dd993375039e0052bbccb4c3065a17849852c9283e20c5 AUX rocm-smi-5.7.1-remove-example.patch 560 BLAKE2B 6f541822947e6f458e5c553c307e137de63db884d7933dd5dad752990c7f4c15d02c47d66dd399d053368d79ab0b6d8237adb1d7c3fae28a9b03d0c34006d027 SHA512 e3be170af0d6f8b4e238e9f9940ac91748fd9b45a0f43fb1c7286d676c2a878a05aeb260e6248bc66ba93adcea5d4c7bc22ce6db6a248cee20d678fdfa7d07ec -AUX rocm-smi-5.7.1-set-soversion.patch 4614 BLAKE2B 0e7f520a2e01536c2e6248e78394857d3d513d93b8cc25a8236e2e04b4d3046ce4b5b0c51beee49eec2943cdb220983dbea223b2082c5e7df7ed086a076e49b1 SHA512 4ee5074617753c9ea0d7a4b6b89e1e6499df6a560e2b201a4c909ccf76000e5fa89d26ffbe7fb7e597ac208ff64fbd7ed1dc61a209fa2c57dcad8843c0282d0b +AUX rocm-smi-5.7.1-set-soversion.patch 5234 BLAKE2B b2e40d803d0511e98c87125dae05a415b2ddf38b28f774edfe6fca1bf552e630f872631b3cfe82c1302a1c2d7be83bf7a6b4e67c0f8eb271612999eaec3cba68 SHA512 af51867d0baeca303932b0d38f716a657bf14f57e595056694eadb2c120c741e03615837eee9b86932f1fa04815c2803b6115e5e2cb81ea51b07d558155eb398 DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8 DIST rocm-smi-5.7.1.tar.gz 801646 BLAKE2B b4799bbdaeb7203c16117cd30511d589a2b96e15801bb9f1382fe7a4d87d43e1d4b458d6923b6ebd602fdccba74bd65bcb98766dbd83c48fc3e02219be8c1022 SHA512 ad364278f137228a39108c93d482635137ea2724a5a39debb5b32329493ebf5c706dcf3863e2e24b6f0b6286f3877942277f5ae447446f155518972b957f7d9d EBUILD rocm-smi-5.1.3-r1.ebuild 1850 BLAKE2B 9f7cbf7d5ec55ac112980609f8a924b5678aa4fa5cf75cdda3d80ad90c15ecb5f1d129a21c0248985d7f4e792abbcd3f0d822e8e10e76314ebaa5fc240632ae9 SHA512 30181897335c17d81a9d9dce8c4417c62fe66a20d557251158bf2a8ffe6fc075e51878a4bd42708ef47a89022fd03a97b4dccca1f5ee450d098cf66af1095158 EBUILD rocm-smi-5.4.2.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e -EBUILD rocm-smi-5.7.1.ebuild 1467 BLAKE2B 7812eaf57110f53ab96ace5656db11ad89599a90b0af6f8163c7eb3f17649cb3837eacf6475abbc117a1ea2b416d7426399dca3508a69e2fffc7e871c1e8ec5b SHA512 748a1722ce13c714837fb8b586a31e0b2ae4e36968829e027217100159fa5adf1c4fef0da0b0d1d30b50dfdaed24f09064159abf9175d2efb6b5b138e758c778 +EBUILD rocm-smi-5.7.1-r1.ebuild 1549 BLAKE2B f89e3e829ae078fc7553b0e17c44ed4a5aa92427f8b873e9076171d267122b57338749dfc8637d62992025b981227e55797f8b70a14f1e00addfc7893310521e SHA512 14e4b3b98b860a42dd5bfe75a90693cddc6e5c61652583134884d881e43e73fc5d974c9b2b71ad22912fec29fd150357b9b5e6e960187568b53954d7154ae4cc EBUILD rocm-smi-9999.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3 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 index 203b179d3faa..f79276d7ab8d 100644 --- 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 @@ -5,7 +5,7 @@ This patch repeats approach of similar patch from Debian, additionally removing 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,27 +30,6 @@ set(SHARE_INSTALL_PREFIX +@@ -30,18 +30,6 @@ set(SHARE_INSTALL_PREFIX "share/${ROCM_SMI}" CACHE STRING "Tests and Example install directory") @@ -21,21 +21,12 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000 -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 --# by git tags (through "git describe") when they are present. --set(PKG_VERSION_MAJOR 1) --set(PKG_VERSION_MINOR 0) --set(PKG_VERSION_PATCH 0) --set(PKG_VERSION_NUM_COMMIT 0) -- - ## Define default variable and variables for the optional build target - ## rocm_smi_lib-dev - set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory.") + # 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,10 @@ set(OAM_NAME "oam") +@@ -29,23 +29,11 @@ set(OAM_NAME "oam") set(OAM_COMPONENT "lib${OAM_NAME}") set(OAM_TARGET "${OAM_NAME}") @@ -56,13 +47,23 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000 -else() - set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}") -endif () -+set(VERSION_MAJOR "1") -+set(VERSION_MINOR "0") ++set(VERSION_MAJOR "@VERSION_MAJOR@") ++set(VERSION_MINOR "@VERSION_MINOR@") + -+set(SO_VERSION_STRING "${VERSION_MAJOR}.${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 @@ -90,7 +91,7 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000 --- a/rocm_smi/CMakeLists.txt +++ b/rocm_smi/CMakeLists.txt -@@ -31,17 +31,8 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64") +@@ -31,23 +31,10 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64") ## Include common cmake modules include(utils) @@ -105,8 +106,25 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000 -get_version_from_tag("5.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) - -# VERSION_* variables should be set by get_version_from_tag -+set(VERSION_MAJOR "1") -+set(VERSION_MINOR "0") - if ( ${ROCM_PATCH_VERSION} ) - set ( VERSION_PATCH ${ROCM_PATCH_VERSION}) - set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +-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/rocm-smi-5.7.1.ebuild b/dev-util/rocm-smi/rocm-smi-5.7.1-r1.ebuild index 5fd0811bd980..86c31040d841 100644 --- a/dev-util/rocm-smi/rocm-smi-5.7.1.ebuild +++ b/dev-util/rocm-smi/rocm-smi-5.7.1-r1.ebuild @@ -37,8 +37,9 @@ PATCHES=( src_prepare() { cmake_src_prepare - sed "s/\${PKG_VERSION_STR}/${PV}/g" \ - -i CMakeLists.txt -i oam/CMakeLists.txt -i rocm_smi/CMakeLists.txt || die + 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() { |