Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rocminfo/files/, dev-util/rocminfo/
Date: Wed, 01 Feb 2023 09:53:36
Message-Id: 1675245166.f55458507d313fcc9056eb7c1b021324337439e8.asturm@gentoo
1 commit: f55458507d313fcc9056eb7c1b021324337439e8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 24 22:16:13 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 09:52:46 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5545850
7
8 dev-util/rocminfo: drop 5.0.2
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 dev-util/rocminfo/Manifest | 1 -
13 .../rocminfo-4.3.0-detect-builtin-amdgpu.patch | 25 ------------------
14 dev-util/rocminfo/rocminfo-5.0.2.ebuild | 30 ----------------------
15 3 files changed, 56 deletions(-)
16
17 diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
18 index fd18d19d9f8d..78cf76123025 100644
19 --- a/dev-util/rocminfo/Manifest
20 +++ b/dev-util/rocminfo/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST rocminfo-5.0.2.tar.gz 15767 BLAKE2B 4617e4df51cc0b02d1743e655491600510e4f9fc22ef47612aa69bc311e7dc3979b0063c650d9a4fee0124be404b92c110dc9db056a554ee25ba3d4bfd12f618 SHA512 dd02837e621a414b54ef50b52ca816509ffa8b613e7de5f8b09449c5fc543dee054860a2245462008f687683af48203b6d2080fe71bf6e3654981d6bfd56e254
23 DIST rocminfo-5.1.3.tar.gz 16772 BLAKE2B 1b35661f9e6cd8cd5180ef3e4fd3dd8e7d6b282947d25c81b0b8bd347a5bee11cf87d950bbd8adcbd7a8a3053c41622b8e99fc0b56f4a14bdf4acf20992becc7 SHA512 998d499b0ae9a22bde30b2c26e31587a78b5ed63a19649d5b203eb47a044f17d1d4d3e951ec094d5be1ca3ba37efa4b19f5b53047727158170fa90c13a8c7563
24 DIST rocminfo-5.3.3.tar.gz 16829 BLAKE2B 341908048b9726a22ab5e81317916166d4ba114c5060fd8b7b455e0f4df3857b16a735cfccce2d013cd6632680e29b2e0c9ef91461d46b7e94dc71b0751aa42e SHA512 336a408eb49eb8d40b506f58d62de3fd406d00b0de169bc3f6176c76f1f50366347d212de8783b5c48ae1b6660d307b276ba6b3bac8d8286f5e93cfe739c4dae
25
26 diff --git a/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch b/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch
27 deleted file mode 100644
28 index a01eb3ec3909..000000000000
29 --- a/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch
30 +++ /dev/null
31 @@ -1,25 +0,0 @@
32 -/sys/module/amdgpu instead of lsmod for builtin amdgpu kernel module
33 -
34 -https://github.com/RadeonOpenCompute/rocminfo/pull/43
35 -https://github.com/RadeonOpenCompute/rocminfo/issues/42
36 ---- a/rocminfo.cc
37 -+++ b/rocminfo.cc
38 -@@ -1035,14 +1035,15 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) {
39 -
40 - int CheckInitialState(void) {
41 - // Check kernel module for ROCk is loaded
42 -- FILE *fd = popen("lsmod | grep amdgpu", "r");
43 -- char buf[16];
44 -- if (fread (buf, 1, sizeof (buf), fd) <= 0) {
45 -+ int module_dir;
46 -+ module_dir = open("/sys/module/amdgpu", O_DIRECTORY);
47 -+ if (module_dir < 0) {
48 - printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n",
49 - COL_RED, COL_RESET);
50 - return -1;
51 - } else {
52 - printf("%sROCk module is loaded%s\n", COL_WHT, COL_RESET);
53 -+ close(module_dir);
54 - }
55 -
56 - // Check if user belongs to the group for /dev/kfd (e.g. "video" or
57
58 diff --git a/dev-util/rocminfo/rocminfo-5.0.2.ebuild b/dev-util/rocminfo/rocminfo-5.0.2.ebuild
59 deleted file mode 100644
60 index 1cbe2856e43a..000000000000
61 --- a/dev-util/rocminfo/rocminfo-5.0.2.ebuild
62 +++ /dev/null
63 @@ -1,30 +0,0 @@
64 -# Copyright 1999-2022 Gentoo Authors
65 -# Distributed under the terms of the GNU General Public License v2
66 -
67 -EAPI=8
68 -
69 -inherit cmake
70 -
71 -if [[ ${PV} == *9999 ]] ; then
72 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
73 - inherit git-r3
74 -else
75 - SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
76 - KEYWORDS="~amd64"
77 - S="${WORKDIR}/rocminfo-rocm-${PV}"
78 -fi
79 -
80 -DESCRIPTION="ROCm Application for Reporting System Info"
81 -HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
82 -LICENSE="UoI-NCSA"
83 -SLOT="0/$(ver_cut 1-2)"
84 -
85 -RDEPEND=">=dev-libs/rocr-runtime-${PV}"
86 -DEPEND="${RDEPEND}"
87 -
88 -PATCHES=("${FILESDIR}/${PN}-4.3.0-detect-builtin-amdgpu.patch")
89 -
90 -src_prepare() {
91 - sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
92 - cmake_src_prepare
93 -}