public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/amdsmi] epel10: Update preview to 7.12
@ 2026-06-09 22:35 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-06-09 22:35 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/amdsmi
            Branch : epel10
            Commit : 84ac7bce9486f4d8a88f737e11fedd1795b5b84b
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-03-28T14:09:36-07:00
            Stats  : +54/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/amdsmi/c/84ac7bce9486f4d8a88f737e11fedd1795b5b84b?branch=epel10

            Log:
            Update preview to 7.12

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/0001-amdsmi-so-libamdsminic.patch b/0001-amdsmi-so-libamdsminic.patch
new file mode 100644
index 0000000..4a09af5
--- /dev/null
+++ b/0001-amdsmi-so-libamdsminic.patch
@@ -0,0 +1,28 @@
+From 60a7f7ace628eb535bc2e92af0cf38743a28b694 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Sat, 28 Mar 2026 13:56:20 -0700
+Subject: [PATCH] amdsmi so libamdsminic
+
+---
+ projects/amdsmi/src/nic/ai-nic/amdsmi_unified/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/projects/amdsmi/src/nic/ai-nic/amdsmi_unified/CMakeLists.txt b/projects/amdsmi/src/nic/ai-nic/amdsmi_unified/CMakeLists.txt
+index 2da6b8bf4cf5..f5f63c4d835d 100644
+--- a/projects/amdsmi/src/nic/ai-nic/amdsmi_unified/CMakeLists.txt
++++ b/projects/amdsmi/src/nic/ai-nic/amdsmi_unified/CMakeLists.txt
+@@ -37,7 +37,10 @@ set(NIC_DEFAULT_CXX_FLAGS "${NIC_DEFAULT_CXX_FLAGS} -Wl,-z,relro,-z,noexecstack,
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NIC_DEFAULT_CXX_FLAGS}")
+ 
+ file(GLOB CPP_SRCS "${NIC_SOURCE_DIR}/*.cpp")
+-add_library(amdsminic STATIC ${CPP_SRCS})
++add_library(amdsminic SHARED ${CPP_SRCS})
++set_property(TARGET amdsminic PROPERTY SOVERSION "${MAJOR}")
++set_property(TARGET amdsminic PROPERTY VERSION "${SO_VERSION_STRING}")
++
+ set_target_properties(amdsminic PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${NIC_BUILD_DIR})
+ target_include_directories(amdsminic PUBLIC
+     "$<BUILD_INTERFACE:${PROJECT_ROOT}/inc>"
+-- 
+2.53.0
+

diff --git a/amdsmi.spec b/amdsmi.spec
index a55b2bb..10ab8c5 100644
--- a/amdsmi.spec
+++ b/amdsmi.spec
@@ -23,7 +23,7 @@
 
 %bcond_with preview
 %if %{with preview}
-%global rocm_release 7.11
+%global rocm_release 7.12
 %global rocm_patch 0
 %global pkg_src therock-%{rocm_release}
 %else
@@ -92,11 +92,17 @@ Source0:    %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstre
 # found in the upstream kernel.
 %global esmi_ver 4.2
 Source1:    https://github.com/amd/esmi_ib_library/archive/refs/tags/esmi_pkg_ver-%{esmi_ver}.tar.gz
+%if %{without preview}
 # https://github.com/ROCm/amdsmi/pull/165
-Patch4:     0001-Fix-compilation-with-libdrm-2.4.130.patch
+Patch1:     0001-Fix-compilation-with-libdrm-2.4.130.patch
+%else
+# https://github.com/ROCm/rocm-systems/issues/4535
+Patch1:     0001-amdsmi-so-libamdsminic.patch
+%endif
 
 ExclusiveArch: x86_64
 
+BuildRequires: chrpath
 BuildRequires: cmake
 BuildRequires: gcc-c++
 BuildRequires: kernel-devel
@@ -149,7 +155,12 @@ Requires:       libdrm-devel
 %endif
 
 %prep
+%if %{without preview}
 %autosetup -p1 -n %{upstreamname}
+%else
+%autosetup -p3 -n %{upstreamname}
+%endif
+
 tar xf %{SOURCE1}
 mv esmi_ib_library-* esmi_ib_library
 # So we can pick up this license
@@ -246,6 +257,11 @@ mkdir %{buildroot}%{pkg_prefix}/share/amdsmi
 mv %{buildroot}%{pkg_prefix}/share/tests %{buildroot}%{pkg_prefix}/share/amdsmi/.
 %endif
 
+%if %{with preview}
+#ERROR   0002: file '/usr/lib/python3.14/site-packages/amdsmi/libamd_smi.so' contains an invalid runpath '/builddir/build/BUILD/amdsmi-7.12.0-build/amdsmi/redhat-linux-build/src/nic/ai-nic/amdsmi_unified/build' in [/builddir/build/BUILD/amdsmi-7.12.0-build/amdsmi/redhat-linux-build/src/nic/ai-nic/amdsmi_unified/build:]
+chrpath -d %{buildroot}%{pkg_prefix}/lib/python%{python3_version}/site-packages/amdsmi/libamd_smi.so
+%endif
+
 %if 0%{?suse_version}
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -262,6 +278,9 @@ mv %{buildroot}%{pkg_prefix}/share/tests %{buildroot}%{pkg_prefix}/share/amdsmi/
 %{pkg_prefix}/libexec/amdsmi_cli
 %{pkg_prefix}/lib/python%{python3_version}/site-packages/amdsmi
 %endif
+%if %{with preview}
+%{pkg_prefix}/%{pkg_libdir}/libamdsminic.so.*
+%endif
 
 %files devel
 %{pkg_prefix}/include/amd_smi/
@@ -271,6 +290,11 @@ mv %{buildroot}%{pkg_prefix}/share/tests %{buildroot}%{pkg_prefix}/share/amdsmi/
 %if %{without compat}
 %{pkg_prefix}/%{pkg_libdir}/libgoamdsmi_shim64.so
 %endif
+%if %{with preview}
+%{pkg_prefix}/include/e_smi/
+%{pkg_prefix}/include/rocm_smi/
+%{pkg_prefix}/%{pkg_libdir}/libamdsminic.so
+%endif
 
 %if %{with test}
 %files test

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-09 22:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-09 22:35 [rpms/amdsmi] epel10: Update preview to 7.12 Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox