From 28df6cf600a5c956e94963f37f4e2981cc9b4a7d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 01 2022 11:56:40 +0000
Subject: import kernel-srpm-macros-1.0-11.el9


---

diff --git a/SOURCES/find-provides.ksyms b/SOURCES/find-provides.ksyms
index af98b90..92d6220 100755
--- a/SOURCES/find-provides.ksyms
+++ b/SOURCES/find-provides.ksyms
@@ -45,7 +45,14 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do
         else
             RODATA=$ELFRODATA
         fi
-        for sym in $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do
+        # Commit binutils-2_33~1385[1] has changed (and binutils-2_35~1768[2]
+        # has not reverted it) the calculated type for symbols in read-write
+        # .rodata section from 'R' to 'D', since, apparently, many kernel
+        # modules have it indeed read-write.
+        #
+        # [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=a288c270991d
+        # [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=49d9fd42acef
+        for sym in $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) [DR] __crc_(.+):0x\1 \2:p'); do
             echo $sym $RODATA
         done \
         | awk --non-decimal-data '{printf("'"${dep_pfx}"'(%s) = 0x%08s\n", $2, substr($3,($1*2)+1,8))}' \
diff --git a/SOURCES/find-requires.ksyms b/SOURCES/find-requires.ksyms
index 533fac0..78a2105 100755
--- a/SOURCES/find-requires.ksyms
+++ b/SOURCES/find-requires.ksyms
@@ -46,7 +46,14 @@ all_provides() {
             else
                 RODATA=$ELFRODATA
             fi
-            for sym in $(nm "$module" | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do
+            # Commit binutils-2_33~1385[1] has changed (and binutils-2_35~1768[2]
+            # has not reverted it) the calculated type for symbols in read-write
+            # .rodata section from 'R' to 'D', since, apparently, many kernel
+            # modules have it indeed read-write.
+            #
+            # [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=a288c270991d
+            # [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=49d9fd42acef
+            for sym in $(nm "$module" | sed -r -ne 's:^0*([0-9a-f]+) [DR] __crc_(.+):0x\1 \2:p'); do
                 echo $sym $RODATA
             done \
             | awk --non-decimal-data '{printf("%s:0x%08s\n", $2, substr($3,($1*2)+1,8))}'
diff --git a/SPECS/kernel-srpm-macros.spec b/SPECS/kernel-srpm-macros.spec
index 54cb3f1..5500b0a 100644
--- a/SPECS/kernel-srpm-macros.spec
+++ b/SPECS/kernel-srpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           kernel-srpm-macros
 Version:        1.0
-Release:        10%{?dist}
+Release:        11%{?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
@@ -121,6 +121,11 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
 %{rrcdir}/find-provides.d/modalias.prov
 
 %changelog
+* Thu Feb 17 2022 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-11
+- Work around a change in type of __crc_* symbols for some kmods printed by nm
+  on ppc64le and s390x
+- Resolves: #2055464
+
 * Thu Nov 18 2021 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-10
 - Add conflicts of kernel-srpm-macros with kernel-rpm-macros < 185-9
   as macros.kmp, kmodtool, and rpmsort were moved from the latter