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/rocminfo] epel10: merge compat changes
Date: Wed, 10 Jun 2026 22:43:14 GMT	[thread overview]
Message-ID: <178113139470.1.15859647714104774683.rpms-rocminfo-ebfdcc7645a1@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/rocminfo
            Branch : epel10
            Commit : ebfdcc7645a1b279976e3768825dd099702de24d
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-06-02T08:52:23-07:00
            Stats  : +6/-35 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rocminfo/c/ebfdcc7645a1b279976e3768825dd099702de24d?branch=epel10

            Log:
            merge compat changes

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

---
diff --git a/0001-adjust-CMAKE_CXX_FLAGS.patch b/0001-adjust-CMAKE_CXX_FLAGS.patch
deleted file mode 100644
index b34e78c..0000000
--- a/0001-adjust-CMAKE_CXX_FLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 969bad383f3050c4c7a58826cf2c4087089c87db Mon Sep 17 00:00:00 2001
-From: Philipp Knechtges <philipp-dev@knechtges.com>
-Date: Tue, 24 Nov 2020 20:48:29 +0100
-Subject: [PATCH 1/2] adjust CMAKE_CXX_FLAGS
-
----
- CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 426657d..1e8d377 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -140,13 +140,7 @@ set(ROCMINFO_CXX_FLAGS ${ROCMINFO_CXX_FLAGS} -fmerge-all-constants)
- set(ROCMINFO_CXX_FLAGS ${ROCMINFO_CXX_FLAGS} -fms-extensions)
- set(ROCMINFO_CXX_FLAGS ${ROCMINFO_CXX_FLAGS} -Werror)
- set(ROCMINFO_CXX_FLAGS ${ROCMINFO_CXX_FLAGS} -Wall)
--
--#
--# Extend the compiler flags for 64-bit builds
--#
--if((${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") OR (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "AMD64"))
--  set(ROCMINFO_CXX_FLAGS ${ROCMINFO_CXX_FLAGS} -m64 -msse -msse2)
--endif()
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{CXXFLAGS}")
- 
- #
- # Add compiler flags to include symbol information for debug builds
--- 
-2.45.2
-

diff --git a/rocminfo.spec b/rocminfo.spec
index c6d9197..cad322b 100644
--- a/rocminfo.spec
+++ b/rocminfo.spec
@@ -54,7 +54,7 @@ Version:    %{rocm_version}
 %if %{with preview}
 Release:    0%{?dist}
 %else
-Release:    3%{?dist}
+Release:    4%{?dist}
 %endif
 
 Summary:    ROCm system info utility
@@ -65,7 +65,6 @@ License:    NCSA AND MIT
 #   rocm_agent_enumerator
 URL:        https://github.com/ROCm/rocm-systems
 Source0:    %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
-Patch0:     0001-adjust-CMAKE_CXX_FLAGS.patch
 
 ExclusiveArch:  x86_64
 
@@ -77,6 +76,8 @@ BuildRequires:  python3-devel
 
 # rocminfo calls lsmod to check the kernel mode driver status
 Requires:       kmod
+Requires:       rocm-filesystem%{pkg_suffix}
+Requires:       rocm-runtime%{pkg_suffix}
 
 %description
 ROCm system info utility
@@ -108,9 +109,7 @@ sed -i -e 's@/usr/bin/env python3@/usr/bin/python3@' rocm_agent_enumerator
 chmod 755 %{buildroot}%{pkg_prefix}/bin/*
 
 # Extra licenses
-# Fedora
 rm -f %{buildroot}%{pkg_prefix}/share/doc/*/License.txt
-# OpenSUSE
 rm -f %{buildroot}%{pkg_prefix}/share/doc/*/*/License.txt
 
 %files
@@ -120,6 +119,9 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/*/*/License.txt
 %{pkg_prefix}/bin/rocminfo
 
 %changelog
+* Tue Jun 2 2026 Tom Rix <Tom.Rix@amd.coM> - 7.2.0-4
+- merge compat changes
+
 * Thu Mar 5 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-3
 - Add --with preview
 

                 reply	other threads:[~2026-06-10 22:43 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=178113139470.1.15859647714104774683.rpms-rocminfo-ebfdcc7645a1@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