public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tom Rix <Tom.Rix@amd.com>
To: git-commits@fedoraproject.org
Subject: [rpms/amdsmi] epel10: Merge back amdsmi7.2
Date: Tue, 09 Jun 2026 22:35:54 GMT	[thread overview]
Message-ID: <178104455472.1.14354438041737993738.rpms-amdsmi-164b0401d0a9@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/amdsmi
            Branch : epel10
            Commit : 164b0401d0a9f4346ac94446c335ae363a8155e5
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-03-21T14:16:55-07:00
            Stats  : +25/-4 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/amdsmi/c/164b0401d0a9f4346ac94446c335ae363a8155e5?branch=epel10

            Log:
            Merge back amdsmi7.2

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

---
diff --git a/amdsmi.spec b/amdsmi.spec
index 63312d9..7a86a8f 100644
--- a/amdsmi.spec
+++ b/amdsmi.spec
@@ -66,15 +66,23 @@ Version:    %{rocm_version}
 %if %{with preview}
 Release:    0%{?dist}
 %else
-Release:    4%{?dist}
+Release:    5%{?dist}
 %endif
 Summary:    AMD System Management Interface
 
-License:    MIT AND (GPL-2.0-only WITH Linux-syscall-note)
+License:    MIT AND (GPL-2.0-only WITH Linux-syscall-note) AND NSCA
 # Main license is MIT
 # 
 # This file is GPL-2.0
 # include/amd_smi/impl/amd_hsmp.h
+# esmi_ib_library/include/asm/amd_hsmp.h
+# Both carry this license
+# /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+# But license check says, incorrectly they are
+# *No copyright* GNU General Public License, Version 2
+#
+# NSCA
+# Covers the bundled esmi_ib_library
 
 URL:        https://github.com/ROCm/rocm-systems
 Source0:    %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
@@ -111,6 +119,10 @@ BuildRequires: gtest-devel
 Requires:      python3dist(pyyaml)
 %endif
 
+%if %{with compat}
+Requires:       rocm-filesystem%{pkg_suffix}
+%endif
+
 # University of Illinois/NCSA Open Source License
 Provides: bundled(esmi_ib_library) = %{esmi_ver}
 
@@ -172,6 +184,7 @@ sed -i 's@set(SHARE_INSTALL_PREFIX@#set(SHARE_INSTALL_PREFIX@' CMakeLists.txt
 
 %build
 %cmake \
+    -DCMAKE_INSTALL_PREFIX=%{pkg_prefix} \
     -DBUILD_KERNEL_ASM_DIR=/usr/include/asm \
     -DBUILD_TESTS=%build_test \
     -DCMAKE_INSTALL_LIBDIR=%{pkg_libdir} \
@@ -210,6 +223,9 @@ rm -f %{buildroot}/%{pkg_prefix}/bin/amd-smi
 rm -rf %{buildroot}/%{pkg_prefix}/libexec/amdsmi_cli
 rm -rf %{buildroot}/%{pkg_prefix}/share/amdsmi
 rm -rf %{buildroot}/%{pkg_prefix}/share/pyproject.toml
+
+# Not going to handle golang in compat mode
+rm -rf %{buildroot}/%{pkg_prefix}/%{pkg_libdir}/libgoamdsmi_shim64*
 %endif
 
 # Remove some things
@@ -240,8 +256,8 @@ mv %{buildroot}%{pkg_prefix}/share/tests %{buildroot}%{pkg_prefix}/share/amdsmi/
 %license LICENSE
 %license esmi_ib_library_License.txt 
 %{pkg_prefix}/%{pkg_libdir}/libamd_smi.so.*
-%{pkg_prefix}/%{pkg_libdir}/libgoamdsmi_shim64.so.*
 %if %{without compat}
+%{pkg_prefix}/%{pkg_libdir}/libgoamdsmi_shim64.so.*
 %{pkg_prefix}/bin/amd-smi
 %{pkg_prefix}/libexec/amdsmi_cli
 %{pkg_prefix}/lib/python%{python3_version}/site-packages/amdsmi
@@ -251,8 +267,10 @@ mv %{buildroot}%{pkg_prefix}/share/tests %{buildroot}%{pkg_prefix}/share/amdsmi/
 %{pkg_prefix}/include/amd_smi/
 %{pkg_prefix}/include/*.h
 %{pkg_prefix}/%{pkg_libdir}/libamd_smi.so
-%{pkg_prefix}/%{pkg_libdir}/libgoamdsmi_shim64.so
 %{pkg_prefix}/%{pkg_libdir}/cmake/amd_smi/
+%if %{without compat}
+%{pkg_prefix}/%{pkg_libdir}/libgoamdsmi_shim64.so
+%endif
 
 %if %{with test}
 %files test
@@ -260,6 +278,9 @@ mv %{buildroot}%{pkg_prefix}/share/tests %{buildroot}%{pkg_prefix}/share/amdsmi/
 %endif
 
 %changelog
+* Sat Mar 21 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-5
+- Merge back amdsmi7.2
+
 * Wed Mar 11 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-4
 - No python for compat
 

                 reply	other threads:[~2026-06-09 22:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178104455472.1.14354438041737993738.rpms-amdsmi-164b0401d0a9@fedoraproject.org \
    --to=tom.rix@amd.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox