From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F56D15800F for ; Wed, 1 Feb 2023 09:53:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90FFCE0E78; Wed, 1 Feb 2023 09:53:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75613E0E77 for ; Wed, 1 Feb 2023 09:53:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B2AD340940 for ; Wed, 1 Feb 2023 09:53:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14A4F8A0 for ; Wed, 1 Feb 2023 09:53:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1675245166.f55458507d313fcc9056eb7c1b021324337439e8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rocminfo/files/, dev-util/rocminfo/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/rocminfo/Manifest dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch dev-util/rocminfo/rocminfo-5.0.2.ebuild X-VCS-Directories: dev-util/rocminfo/ dev-util/rocminfo/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f55458507d313fcc9056eb7c1b021324337439e8 X-VCS-Branch: master Date: Wed, 1 Feb 2023 09:53:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: afdcae89-bf5f-4560-a7a9-b8855040fa56 X-Archives-Hash: 02938d36b73ce0853bba2a58125bb600 commit: f55458507d313fcc9056eb7c1b021324337439e8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 24 22:16:13 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 1 09:52:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5545850 dev-util/rocminfo: drop 5.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/rocminfo/Manifest | 1 - .../rocminfo-4.3.0-detect-builtin-amdgpu.patch | 25 ------------------ dev-util/rocminfo/rocminfo-5.0.2.ebuild | 30 ---------------------- 3 files changed, 56 deletions(-) diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest index fd18d19d9f8d..78cf76123025 100644 --- a/dev-util/rocminfo/Manifest +++ b/dev-util/rocminfo/Manifest @@ -1,3 +1,2 @@ -DIST rocminfo-5.0.2.tar.gz 15767 BLAKE2B 4617e4df51cc0b02d1743e655491600510e4f9fc22ef47612aa69bc311e7dc3979b0063c650d9a4fee0124be404b92c110dc9db056a554ee25ba3d4bfd12f618 SHA512 dd02837e621a414b54ef50b52ca816509ffa8b613e7de5f8b09449c5fc543dee054860a2245462008f687683af48203b6d2080fe71bf6e3654981d6bfd56e254 DIST rocminfo-5.1.3.tar.gz 16772 BLAKE2B 1b35661f9e6cd8cd5180ef3e4fd3dd8e7d6b282947d25c81b0b8bd347a5bee11cf87d950bbd8adcbd7a8a3053c41622b8e99fc0b56f4a14bdf4acf20992becc7 SHA512 998d499b0ae9a22bde30b2c26e31587a78b5ed63a19649d5b203eb47a044f17d1d4d3e951ec094d5be1ca3ba37efa4b19f5b53047727158170fa90c13a8c7563 DIST rocminfo-5.3.3.tar.gz 16829 BLAKE2B 341908048b9726a22ab5e81317916166d4ba114c5060fd8b7b455e0f4df3857b16a735cfccce2d013cd6632680e29b2e0c9ef91461d46b7e94dc71b0751aa42e SHA512 336a408eb49eb8d40b506f58d62de3fd406d00b0de169bc3f6176c76f1f50366347d212de8783b5c48ae1b6660d307b276ba6b3bac8d8286f5e93cfe739c4dae 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 deleted file mode 100644 index a01eb3ec3909..000000000000 --- a/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch +++ /dev/null @@ -1,25 +0,0 @@ -/sys/module/amdgpu instead of lsmod for builtin amdgpu kernel module - -https://github.com/RadeonOpenCompute/rocminfo/pull/43 -https://github.com/RadeonOpenCompute/rocminfo/issues/42 ---- a/rocminfo.cc -+++ b/rocminfo.cc -@@ -1035,14 +1035,15 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) { - - int CheckInitialState(void) { - // Check kernel module for ROCk is loaded -- FILE *fd = popen("lsmod | grep amdgpu", "r"); -- char buf[16]; -- if (fread (buf, 1, sizeof (buf), fd) <= 0) { -+ int module_dir; -+ module_dir = open("/sys/module/amdgpu", O_DIRECTORY); -+ if (module_dir < 0) { - printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n", - COL_RED, COL_RESET); - return -1; - } else { - printf("%sROCk module is loaded%s\n", COL_WHT, COL_RESET); -+ close(module_dir); - } - - // Check if user belongs to the group for /dev/kfd (e.g. "video" or diff --git a/dev-util/rocminfo/rocminfo-5.0.2.ebuild b/dev-util/rocminfo/rocminfo-5.0.2.ebuild deleted file mode 100644 index 1cbe2856e43a..000000000000 --- a/dev-util/rocminfo/rocminfo-5.0.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/" - inherit git-r3 -else - SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocminfo-rocm-${PV}" -fi - -DESCRIPTION="ROCm Application for Reporting System Info" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo" -LICENSE="UoI-NCSA" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocr-runtime-${PV}" -DEPEND="${RDEPEND}" - -PATCHES=("${FILESDIR}/${PN}-4.3.0-detect-builtin-amdgpu.patch") - -src_prepare() { - sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die - cmake_src_prepare -}