[rpms/rocm-rpm-macros] epel10: Merge branch 'rawhide' into epel10

[rpms/rocm-rpm-macros] epel10: Merge branch 'rawhide' into epel10

[Tom Rix]

A new commit has been pushed.

Repo   : rpms/rocm-rpm-macros
Branch : epel10
Commit : ba3aed5856c9393e817a610eaa72b5728631e3b5
Author : Tom Rix <Tom.Rix@amd.com>
Date   : 2026-06-11T06:35:03-07:00
Stats  : +86/-13 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/rocm-rpm-macros/c/ba3aed5856c9393e817a610eaa72b5728631e3b5?branch=epel10

Log:
Merge branch 'rawhide' into epel10

---
diff --git a/macros.rocm.preview b/macros.rocm.preview
new file mode 100644
index 0000000..8db81d2
--- /dev/null
+++ b/macros.rocm.preview
@@ -0,0 +1,30 @@
+%rocm_gpu_list default
+
+%rocm_gpu_list_default "gfx9-generic;gfx942;gfx950;gfx10-1-generic;gfx10-3-generic;gfx11-generic;gfx12-generic"
+%rocm_gpu_list_hipblaslt "gfx1100;gfx1101;gfx1151;gfx1200;gfx1201"
+%rocm_gpu_list_rccl "gfx906;gfx908;gfx90a;gfx942;gfx950;gfx1030;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201"
+%rocm_gpu_list_test "gfx11-generic;gfx12-generic"
+
+%__cc_rocm hipcc
+%__cxx_rocm hipcc
+%__cpp_rocm clang-cpp
+
+%_rocm_extra_ldflags %{?_lto_cflags}
+%build_ldflags -Wl,-z,relro %{?_ld_as_needed_flags} %{?_ld_symbols_flags} %{?_hardened_ldflags} %{?_annotation_ldflags} "%{?_rocm_extra_ldflags}" %{?_build_id_flags} %{?_package_note_flags} %{?_distro_extra_ldflags}
+
+%__spec_install_post\
+    %{?__brp_llvm_compile_lto_elf} \
+    %{?__debug_package:%{__debug_install_post}}\
+    %{__arch_install_post}\
+    %{__os_install_post}\
+%{nil}
+
+%_hardening_rocm_cflags --config /usr/lib/rpm/redhat/redhat-hardened-clang.cfg
+%_hardening_cflags	 -fPIE -Xarch_host -fstack-protector-strong
+%_hardening_ldflags	 -Wl,-z,now
+%_hardening_rocm_ldflags  -Wl,-z,now
+
+%_annobin_rocm_plugin	%dnl-fplugin=/usr/lib64/clang/`clang -dumpversion`/lib/annobin.so
+
+%_rocm_lto_cflags	-flto=thin
+

diff --git a/rocm-7.1 b/rocm-7.1
index bf2f3fe..800f4f2 100644
--- a/rocm-7.1
+++ b/rocm-7.1
@@ -5,10 +5,10 @@
 
 conflict rocm
 
-setenv        ROCM_PATH     /usr/lib64/rocm/7.1
-setenv        ROCM_BIN      /usr/lib64/rocm/7.1/bin
-setenv        ROCM_INCLUDE  /usr/lib64/rocm/7.1/include
-setenv        ROCM_LIB      /usr/lib64/rocm/7.1/lib
-prepend-path  PATH          /usr/lib64/rocm/7.1/bin
-prepend-path  LD_LIBRARY_PATH /usr/lib64/rocm/7.1/lib
-prepend-path  PYTHONPATH    /usr/lib64/rocm/7.1/lib/python3.13/site-packages/
+setenv        ROCM_PATH     /usr/lib64/rocm/rocm-7.1
+setenv        ROCM_BIN      /usr/lib64/rocm/rocm-7.1/bin
+setenv        ROCM_INCLUDE  /usr/lib64/rocm/rocm-7.1/include
+setenv        ROCM_LIB      /usr/lib64/rocm/rocm-7.1/lib
+prepend-path  PATH          /usr/lib64/rocm/rocm-7.1/bin
+prepend-path  LD_LIBRARY_PATH /usr/lib64/rocm/rocm-7.1/lib
+prepend-path  PYTHONPATH    /usr/lib64/rocm/rocm-7.1/lib/python3.13/site-packages/

diff --git a/rocm-7.2 b/rocm-7.2
new file mode 100644
index 0000000..7819e59
--- /dev/null
+++ b/rocm-7.2
@@ -0,0 +1,14 @@
+#%Module 1.0
+#
+#  ROCm module for use with 'environment-modules' package:
+# 
+
+conflict rocm
+
+setenv        ROCM_PATH     /usr/lib64/rocm/rocm-7.2
+setenv        ROCM_BIN      /usr/lib64/rocm/rocm-7.2/bin
+setenv        ROCM_INCLUDE  /usr/lib64/rocm/rocm-7.2/include
+setenv        ROCM_LIB      /usr/lib64/rocm/rocm-7.2/lib
+prepend-path  PATH          /usr/lib64/rocm/rocm-7.2/bin
+prepend-path  LD_LIBRARY_PATH /usr/lib64/rocm/rocm-7.2/lib
+prepend-path  PYTHONPATH    /usr/lib64/rocm/rocm-7.2/lib/python3.13/site-packages/

diff --git a/rocm-rpm-macros.spec b/rocm-rpm-macros.spec
index cb1697b..940694d 100644
--- a/rocm-rpm-macros.spec
+++ b/rocm-rpm-macros.spec
@@ -20,13 +20,20 @@
 # THE SOFTWARE.
 #
 
-%global rocm_release 7.1
+%bcond_with preview
+%if %{with preview}
+%global rocm_release 7.12
 %global rocm_patch 0
+%else
+%global rocm_release 7.2
+%global rocm_patch 0
+%endif
+
 %global rocm_version %{rocm_release}.%{rocm_patch}
 
 %bcond_with compat
 %if %{with compat}
-%global pkg_suffix -%{rocm_release}
+%global pkg_suffix %{rocm_release}
 %else
 %global pkg_suffix %{nil}
 %endif
@@ -34,12 +41,20 @@
 
 Name:           %{pkg_name}
 Version:        %{rocm_version}
-Release:        8%{?dist}
+%if %{with preview}
+Release:        0%{?dist}
+%else
+Release:        2%{?dist}
+%endif
 Summary:        ROCm RPM macros
 License:        GPL-2.0-or-later
 
 URL:            https://github.com/trixirt/rocm-rpm-macros
+%if %{with preview}
+Source0:        macros.rocm.preview
+%else
 Source0:        macros.rocm
+%endif
 Source1:        GPL
 # Modules
 Source2:        default
@@ -61,6 +76,7 @@ Source17:       default.rhel
 Source18:       gfx12
 Source19:       gfx950
 Source30:       rocm-7.1
+Source31:       rocm-7.2
 
 # Just some files
 %global debug_package %{nil}
@@ -87,8 +103,8 @@ Requires:       Modules
 %else
 Requires: environment(modules)
 Requires: cmake-filesystem
-Requires: rocm-llvm-filesystem
 %endif
+Requires: rocm-filesystem%{pkg_suffix}
 
 %description modules
 This package contains ROCm environment modules for switching
@@ -96,7 +112,7 @@ between different GPU families.
 
 %prep
 %setup -cT
-install -pm 644 %{SOURCE0} .
+install -pm 644 %{SOURCE0} macros.rocm
 install -pm 644 %{SOURCE1} .
 mkdir modules
 %if 0%{?rhel}
@@ -122,10 +138,11 @@ install -pm 644 %{SOURCE18} modules
 install -pm 644 %{SOURCE19} modules
 # compat modules
 install -pm 644 %{SOURCE30} modules
+install -pm 644 %{SOURCE31} modules
 
 %install
 mkdir -p %{buildroot}%{_rpmmacrodir}/
-install -Dpm 644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/
+install -Dpm 644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.rocm
 %if 0%{?suse_version}
 mkdir -p %{buildroot}%{_datadir}/modules/rocm/
 cp -p modules/* %{buildroot}%{_datadir}/modules/rocm/
@@ -147,6 +164,15 @@ cp -p modules/* %{buildroot}%{_datadir}/modulefiles/rocm/
 %endif
 
 %changelog
+* Tue Mar 10 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-2
+- Add --with preview
+
+* Fri Feb 6 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-1
+- Update to 7.2.0
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Tue Dec 16 2025 Tom Rix <Tom.Rix@amd.com> - 7.1.0-8
 - Add --with compat
 - Reduce rccl list

diff --git a/rocm-rpm-macros.spec b/rocm-rpm-macros.spec
index 3fb00cb..940694d 100644
--- a/rocm-rpm-macros.spec
+++ b/rocm-rpm-macros.spec
@@ -210,6 +210,9 @@ cp -p modules/* %{buildroot}%{_datadir}/modulefiles/rocm/
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
+* Thu Jun 19 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.0-5
+- Rebuild
+
 * Fri May 9 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.0-4
 - Add gfx950 module