From ca38d51df8e990185915b7771c02bde1c67e3e54 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Tue, 19 May 2026 19:01:42 -0400 Subject: [PATCH] import UBI kernel-srpm-macros-1.0-27.el10 --- kabi.attr | 2 +- kabi.sh | 3 ++- kernel-srpm-macros.spec | 12 ++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/kabi.attr b/kabi.attr index 5500b17..b8de5ba 100644 --- a/kabi.attr +++ b/kabi.attr @@ -1,2 +1,2 @@ %__kabi_provides %{_rpmconfigdir}/kabi.sh -%__kabi_path ^(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.(gz|xz)$ +%__kabi_path ^(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.(gz|xz|zst)$ diff --git a/kabi.sh b/kabi.sh index dd49b8b..122bb7e 100644 --- a/kabi.sh +++ b/kabi.sh @@ -7,12 +7,13 @@ IFS=$'\n' -for symvers in $(grep -E '(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.(gz|xz)') "$@"; +for symvers in $(grep -E '(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.(gz|xz|zst)') "$@"; do cat_prog="cat" case "$symvers" in *.gz) cat_prog="zcat" ;; *.xz) cat_prog="xzcat" ;; + *.zst) cat_prog="zstdcat" ;; esac # We generate dependencies only for symbols exported by vmlinux itself diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index 2829050..eb3e900 100644 --- a/kernel-srpm-macros.spec +++ b/kernel-srpm-macros.spec @@ -1,7 +1,7 @@ Name: kernel-srpm-macros Version: 1.0 # when bumping version and resetting release, don't forget to bump version of kernel-rpm-macros as well -Release: 25%{?dist} +Release: 27%{?dist} Summary: RPM macros that list arches the full kernel is built on # This package only exist in Fedora repositories # The license is the standard (MIT) specified in @@ -94,7 +94,7 @@ cp -p %{sources} . mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d install -p -m 0644 -t %{buildroot}/%{_rpmconfigdir}/macros.d macros.kernel-srpm %if 0%{?rhel} >= 8 - sed -i 's/^%%kernel_arches.*/%%kernel_arches x86_64 s390x ppc64le aarch64/' \ + sed -i 's/^%%kernel_arches.*/%%kernel_arches x86_64 s390x ppc64le aarch64 riscv64/' \ %{buildroot}/%{_rpmconfigdir}/macros.d/macros.kernel-srpm %endif @@ -136,6 +136,14 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %{rrcdir}/rpmsort %changelog +* Wed Nov 05 2025 Eric Chanudet - 1.0-27 +- kabi: handle symvers.zst + Resolves: RHEL-124727 + +* Tue Apr 01 2025 Andrea Bolognani - 1.0-26 +- Finish adding riscv64 (thanks Zhengyu He) + Resolves: RHEL-85853 + * Tue Oct 29 2024 Troy Dawson - 1.0-25 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018