From 1d11fd58980e9d3ac490e23a40104419aa48ab1d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 27 Sep 2022 08:18:06 -0400 Subject: [PATCH] import redhat-rpm-config-196-1.el9 --- SOURCES/find-provides | 2 +- SOURCES/find-requires | 2 +- SOURCES/macros | 3 +++ SPECS/redhat-rpm-config.spec | 10 +++++++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/SOURCES/find-provides b/SOURCES/find-provides index be1669d..9d3bd73 100755 --- a/SOURCES/find-provides +++ b/SOURCES/find-provides @@ -30,7 +30,7 @@ done is_kmod=1 for f in $filelist; do - if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ] + if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ] then is_kernel=1; fi diff --git a/SOURCES/find-requires b/SOURCES/find-requires index a9596ba..1fe480a 100755 --- a/SOURCES/find-requires +++ b/SOURCES/find-requires @@ -22,7 +22,7 @@ filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` unset is_kmod for f in $filelist; do - if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ] + if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ] then is_kmod=1; elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ] diff --git a/SOURCES/macros b/SOURCES/macros index 81471b0..70b343e 100644 --- a/SOURCES/macros +++ b/SOURCES/macros @@ -301,6 +301,9 @@ print(result) %_annobin_clang_plugin %dnl-fplugin=/usr/lib64/clang/`clang -dumpversion`/lib/annobin.so %_annotation_cflags %{?_annotated_build:%{expand:%%{_annobin_%{toolchain}_plugin}}} %_annotation_ldflags %{?_lto_cflags:%{_annotation_cflags}} +# Use the remove-section option to force the find-debuginfo script +# to move the annobin notes into the separate debuginfo file. +%_find_debuginfo_vendor_opts %{?_annotated_build:--remove-section .gnu.build.attributes} # Fail linking if there are undefined symbols. Required for proper # ELF symbol versioning support. Disabled by default. diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec index 17b951d..cb21d27 100644 --- a/SPECS/redhat-rpm-config.spec +++ b/SPECS/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 194 +Version: 196 Release: 1%{?dist} # No version specified. License: GPL+ @@ -213,6 +213,14 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Mon Jun 27 2022 Nick Clifton - 196-1 +- Pass "--remove section .gnu.build.attributes" to the find-debuginfo script. +- Resolves: rhbz#2099613 + +* Wed Jun 15 2022 Florian Festi - 195-1 +- Detect compressed kernel modules +- Resolves: rhbz#2008544 + * Thu Feb 17 2022 Nick Clifton - 194-1 - Use the correct package names for the triggers. - Resolves: rhbz#2030671