gentoo resync : 21.08.2021

3 files changed, 53 insertions, 0 deletions

diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index ec8082a4e00d..af862bf2ac8e 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,3 +1,4 @@
+AUX rocminfo-4.3.0-detect-builtin-amdgpu.patch 936 BLAKE2B f4011201ae5cd4ecd495caa72b3b8e1eda5011265394388eea558479f7aceacf22193a0774f5a9919380b770429d1f40d056c1efde535f5db73bbb6e0d705d33 SHA512 78d075a8640a5223f914390e957fda4ec0297266fbda5837d339560732bd8aac5c46365b1b00cbe4650007d3ca94c711fc838849d74ce0dc4b9fcebc18a7fadb
 DIST rocminfo-3.10.0.tar.gz 15106 BLAKE2B 7cc90a1c0b9c5f8664dc6c9bebe83f590526565df8ccb3b3d137ca1db42a7ae9640c43a2de01ae13319d8ea3267709ff8b0a70d2b4473d84d5350f7568a897fa SHA512 79eae3c294c1f3077515b807f9b0070a32122542ac6330704b9e0130366717361e046a9ccd5f43a02770746d2123292020d94de6878d053aec58519f1bd36521
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
 DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
@@ -5,6 +6,7 @@ DIST rocminfo-3.9.0.tar.gz 15106 BLAKE2B 0be734ee03298a83892fb237f7b171c7bb5779d
 DIST rocminfo-4.0.0.tar.gz 15104 BLAKE2B 858d0856a63af88bfb8d948f729fa4108aff0bbe21270d9679d14a2b5bb3230471f498143ce67921af3271e619896ca2cb1a624029f3154e7aa127c018dc9d74 SHA512 40496919dd40cd3a551c01be6023d81a60aebefa5aebdd2aee87cdec44fde4b54b89b67c380d65e25747ae7fc4d5b592dd01d4728dde447079ee7f63396c0c1a
 DIST rocminfo-4.1.0.tar.gz 15379 BLAKE2B dcf7a663792538dbe5c02fbc9e5874d1e716f2986db0a82f49c20130b4f26e8689be9821dd2e3a7363ad1f54106280e511f157b0d9ba2f67b9bc6fd064c7fe82 SHA512 a0bca3c42f360dfee6739de30d932d6eb0b627cd5d369b437d2fac6054a007a3b958ddf6f8b318bf9cab71b051cdf66ecd123b4cce4ef071bf98e0f2bb739c37
 DIST rocminfo-4.2.0.tar.gz 15379 BLAKE2B a76dd3f0d550d5b8a8c39454ef44d5f0a76ad24e4a3b75a9fd2a1b0d4d983a02a877c0eb4d2e4158f9c8c97602b52a2de9a1f535fad609a52e8cad48c4c8a833 SHA512 801c29ae88878b9448ad2f2c9faaa7ffba3a46c77887bebf2fa8d3db7e9258fb4678cf2b898ddfc88a34fcc0fdcc91c9aa2f4a1509eeb05db6a7b085ae28f3dc
+DIST rocminfo-4.3.0.tar.gz 15379 BLAKE2B 86683d8e88d26a8730cf84b3a1d4f69231ff7158186ca6b867b5a029ae485978cf0d67db2b07c05c046bb300b55b6e80e280b9429cef903e3077dc1da0945b8d SHA512 88b7f1ad86e76ede270d12fc3065eba192fcf3938d749b8345dac3b71be0985071dc5139a801ff46015369cd09b3eefcd8ff9ea71ab297476dda195f57792849
 EBUILD rocminfo-3.10.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.8.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
@@ -12,5 +14,6 @@ EBUILD rocminfo-3.9.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce4604
 EBUILD rocminfo-4.0.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-4.1.0.ebuild 614 BLAKE2B 93d578aeac7bbd6173fa8133c1da9240c351e0fe62f5cfc5ff10d12d68e116b3320276eb25c29180e45969594d16215d90921a4c21caa9d2d68f8f87ed9bf1f0 SHA512 0bcf6920d17952e31f090b2a0830a70cfbe737a31987024a7901d9728795b9166cac2894f6ec995e17a71f7cf33001655e8b5a4c1956413a38d0751b7c1669ac
 EBUILD rocminfo-4.2.0.ebuild 614 BLAKE2B 93d578aeac7bbd6173fa8133c1da9240c351e0fe62f5cfc5ff10d12d68e116b3320276eb25c29180e45969594d16215d90921a4c21caa9d2d68f8f87ed9bf1f0 SHA512 0bcf6920d17952e31f090b2a0830a70cfbe737a31987024a7901d9728795b9166cac2894f6ec995e17a71f7cf33001655e8b5a4c1956413a38d0751b7c1669ac
+EBUILD rocminfo-4.3.0.ebuild 679 BLAKE2B f3efa2bbccc24bcc06179594a432ce9d53b3dfe89e545bfbc6d712fb928db7a89db764a03e988ab60f0ceaf5d52ac58680b8130a96365c6b6401b2d9df7de066 SHA512 cfd93c79aa88dedcd1e80223494e6e27b62cc949bede65c471bba4dc25da12f9fe687af0c8ff42a31f84d3132e74d64ab9a4774c212e2d5242a2daff438a2e1e
 EBUILD rocminfo-9999.ebuild 606 BLAKE2B 74046413f39f646c076f8cbc9d0a5d1373c3be8e303bd50767d6019d3b1a58a06d05ef0dbdacdcd079aeb519c28fc163c38246608024b9fc4225c99051d3b6df SHA512 20dcaa312421446d3ee1882f85babfdfd51a51dd598eae824b36d7fc8969da717f05685d436c59b61d2d1744479672a4de544667379a7fb9163c5e9637fab70c
 MISC metadata.xml 369 BLAKE2B 6549050343e744050fde68092a20018b058f5d2411b4f7dcb5ade0e7ea56e7f8f9f6a00040882f1384f01ed2f5b74a1d453c276c8d35aaa12021225f0c7c6346 SHA512 4b7e636a59c30446dfb02d82d80804706dbc04b464f7d7ce37340be1076a9723cb5ec164972dc07a325b69fefb1dc3026055fb5b87588b6b6fbaf4e9dfbc2ef9
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
new file mode 100644
index 000000000000..a01eb3ec3909
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch
@@ -0,0 +1,25 @@
+/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-4.3.0.ebuild b/dev-util/rocminfo/rocminfo-4.3.0.ebuild
new file mode 100644
index 000000000000..ba629c1e3b72
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-4.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
+
+PATCHES=("${FILESDIR}/${PN}-4.3.0-detect-builtin-amdgpu.patch")