SOURCES/find-provides.ksyms

@@ -6,6 +6,7 @@ export LC_ALL=C
 # Prevent elfutils from trying to download debuginfos
 unset DEBUGINFOD_URLS
 
+
 for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do
     dep_pfx="ksym"
     # For built-in kmods, "kernel()" syntax is used instead of "ksym()"
@@ -37,101 +38,53 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do
         module="$tmpfile"
     fi
 
-    # A modversion can be stored as an ELF symbol in various ways:
+    # awk script return code:
-    # - An immediate symbol whose value is available directly;  it shows up
+    #   0 - absolute __crc_* symbols have been found, output has been
-    #   in the nm or objdump -t output, for example:
+    #       generated;
-    #       $ nm mlx5_core_5.14.x86_64.ko | grep '__crc_' | head -n 3
+    #   23 - a non-absolute __crc_* symbold has been found;
-    #       0000000092f175ca A __crc_mlx5_access_reg
+    #   42 - no __crc_* symbols have been found.
-    #       000000005b88c9f1 A __crc_mlx5_add_flow_rules
+    nm "$module" \
-    #       00000000e7c0ec8a A __crc_mlx5_alloc_bfreg
-    #       $ objdump -t lib/modules/mlx5_core_5.14.x86_64.ko | grep __crc_ | sort -k 5,5 | head -n 3
-    #       0000000092f175ca g       *ABS*	0000000000000000 __crc_mlx5_access_reg
-    #       000000005b88c9f1 g       *ABS*	0000000000000000 __crc_mlx5_add_flow_rules
-    #       00000000e7c0ec8a g       *ABS*	0000000000000000 __crc_mlx5_alloc_bfreg
-    #       $ zgrep mlx5_access_reg ./lib/modules/5.14.0-284.15.1.el9_2.x86_64/symvers.gz
-    #       0x92f175ca	mlx5_access_reg	drivers/net/ethernet/mellanox/mlx5/core/mlx5_core	EXPORT_SYMBOL_GPL
-    #   This approach was being used on x86 and arm before Linux 5.19,
-    #   for example.
-    #
-    # - A globally or locally visible symbol in a read-only (or not;
-    #   sometimes .rodata is not a read-only section, after all, as binutils
-    #   commit binutils-2_33~1385 has revealed (and binutils-2_35~1768 hasn't
-    #   concealed back)) section (historically .rodata, __kcrctab/__kcrctab_gpl
-    #   since Linux v5.19-rc1~139^2~2):
-    #       $ nm mlx5_core_5.14.s390x.ko | grep '__crc_' | head -n 3
-    #       0000000000002f7c R __crc_mlx5_access_reg
-    #       0000000000003304 R __crc_mlx5_add_flow_rules
-    #       0000000000002d2c R __crc_mlx5_alloc_bfreg
-    #   This layout is used on ppc since Linux v4.10-rc7~15^2~1, for example,
-    #   and on all architectures since Linux 5.19.  To extract the symbol
-    #   versions in this case, we get the offset and the section name
-    #   from the "objdump -t" output:
-    #       $ objdump -t lib/modules/mlx5_core_5.14.s390x.ko | grep '__crc_' | sort -k 5,5 | head -n 2
-    #       0000000000002f7c g       .rodata	0000000000000000 __crc_mlx5_access_reg
-    #       0000000000003304 g       .rodata	0000000000000000 __crc_mlx5_add_flow_rules
-    #   and the section contents from the "readelf -R" call:
-    #       $ readelf -R .rodata mlx5_core_5.14.s390x.ko
-    #       [... skipped output ...]
-    #         0x00002f70 6c6f635f 6e6f6465 00000000 ed6560a8 loc_node.....e`.
-    #                                               ^^^^^^^^
-    #   comparison with the contents
-    #   of lib/modules/5.14.0-284.15.1.el9_2.s390x/symvers.gz corroborates
-    #   its correctness:
-    #       0xed6560a8	mlx5_access_reg	drivers/net/ethernet/mellanox/mlx5/core/mlx5_core	EXPORT_SYMBOL_GPL
-    #   As mentioned earlier, for the later kernel versions, __kcrctab{,_gpl}
-    #   sections are used:
-    #       $ objdump -t lib/modules/mlx5_core_6.4.x86_64.ko | grep '__crc_' | sort -k 5,5 | head -n 2
-    #       0000000000000000 l       __kcrctab_gpl	0000000000000000 __crc_mlx5_access_reg
-    #       0000000000000090 l       __kcrctab	0000000000000000 __crc_mlx5_add_flow_rules
-    #       $ readelf -R __kcrctab_gpl mlx5_core_6.4.x86_64.ko
-    #         0x00000000 38b0d3c3 1840ce35 b99babc7 70b4700c 8....@.5....p.p.
-    #                    ^^^^^^^^
-    #   and in lib/modules/6.4.0-0.rc1.20230511git80e62bc8487b.19.eln126.x86_64/symvers.xz
-    #   we see that it is correct (when accounted for the little endianness):
-    #       0xc3d3b038	mlx5_access_reg	drivers/net/ethernet/mellanox/mlx5/core/mlx5_core	EXPORT_SYMBOL_GPL
-    #   This data, after some post-processing,  can be used in the awk script
-    #   that extracts parts of the section according to the offsets got
-    #   from the "objdump -t" output.
-    objdump -t "$module" \
     | awk \
-      -v 'dep_pfx='"$dep_pfx" \
+       -v 'dep_pfx='"$dep_pfx" \
-      -v 'module='"$module" \
+       --non-decimal-data \
-      --non-decimal-data \
+       'BEGIN { exit_code = 42 }
-      'BEGIN { revbytes = 0 }
+       match($0, /^([0-9a-f]+) (.) __crc_(.+)/, a) {
+           if (a[2] == "A") {
+               printf("%s(%s) = 0x%08x\n", dep_pfx, a[3], strtonum("0x" a[1]));
+               exit_code = 0;
+           } else {
+               exit_code = 23;
+               exit;
+           }
+       }
+       END { exit exit_code }'
 
-      function check_endianness(   t) {
+    [ 23 = "$?" ] && {
-          if (revbytes) return revbytes;
+        kmod_elf_hdr="$(readelf -h "$module")"
+        [ "x$kmod_elf_hdr" = "x${kmod_elf_hdr%Data:*little endian*}" ]
+        revbytes="$?"
 
-          revbytes = -1;
+        objdump -t "$module" \
-          while (("readelf -h \"" module "\"" | getline t) > 0) {
+        | awk \
-              if (match(t, /^  Data: *2\047s complement, little endian$/)) {
+          -v 'dep_pfx='"$dep_pfx" \
-                  revbytes = 1;
+          -v 'module='"$module" \
-                  break;
+          -v 'revbytes='"$revbytes" \
+          --non-decimal-data \
+          'function readsect(name,   a, t) {
+              a = "";
+              while (("readelf -R \"" name "\" \"" module "\"" | getline t) > 0) {
+                  if (match(t, /^  0x[0-9a-f]{8}/))
+                      a = a substr(t, 14, 8) substr(t, 23, 8) substr(t, 32, 8) substr(t, 41, 8);
               }
+              if (revbytes) { a = gensub(/(..)(..)(..)(..)/, "\\4\\3\\2\\1", "g", a); }
+              sectdata[name] = a;
           }
 
-          return revbytes;
+          match($0, /^([0-9a-f]+) [gl]...... (.*)	[0-9a-f]+ __crc_(.*)$/, a) {
-      }
-
-      function readsect(name,   a, t) {
-          a = "";
-          while (("readelf -R \"" name "\" \"" module "\"" | getline t) > 0) {
-              if (match(t, /^  0x[0-9a-f]{8}/))
-                  a = a substr(t, 14, 8) substr(t, 23, 8) substr(t, 32, 8) substr(t, 41, 8);
-          }
-          if (check_endianness() == 1)
-              a = gensub(/(..)(..)(..)(..)/, "\\4\\3\\2\\1", "g", a);
-          sectdata[name] = a;
-      }
-
-      match($0, /^([0-9a-f]+) [gl]...... (.*)	[0-9a-f]+ __crc_(.*)$/, a) {
-          if (a[2] == "*ABS*") {
-              printf("%s(%s) = 0x%08x\n", dep_pfx, a[3], strtonum("0x" a[1]));
-          } else {
               if (!(a[2] in sectdata)) { readsect(a[2]) }
               printf("%s(%s) = 0x%08s\n", dep_pfx, a[3], substr(sectdata[a[2]], (strtonum("0x" a[1]) * 2) + 1, 8))
-          }
+          }'
-      }'
+    }
 
     [ -z "$tmpfile" ] || rm -f -- "$tmpfile"
 done \

SOURCES/find-requires.ksyms

@@ -11,6 +11,7 @@ export LC_ALL=C
 # Prevent elfutils from trying to download debuginfos
 unset DEBUGINFOD_URLS
 
+
 # Extract all of the symbols provided by this module.
 all_provides() {
     for module in "$@"; do
@@ -39,45 +40,53 @@ all_provides() {
             module="$tmpfile"
         fi
 
-        objdump -t "$module" \
+        # awk script return code:
+        #   0 - absolute __crc_* symbols have been found, output has been
+        #       generated;
+        #   23 - a non-absolute __crc_* symbold has been found;
+        #   42 - no __crc_* symbols have been found.
+        nm "$module" \
         | awk \
-          -v 'dep_pfx='"$dep_pfx" \
+           -v 'dep_pfx='"$dep_pfx" \
-          -v 'module='"$module" \
+           --non-decimal-data \
-          --non-decimal-data \
+           'BEGIN { exit_code = 42 }
-          'BEGIN { revbytes = 0 }
+           match($0, /^([0-9a-f]+) (.) __crc_(.+)/, a) {
-
+               if (a[2] == "A") {
-          function check_endianness(   t) {
+                   printf("%s(%s) = 0x%08x\n", dep_pfx, a[3], strtonum("0x" a[1]));
-              if (revbytes) return revbytes;
+                   exit_code = 0;
-
+               } else {
-              revbytes = -1;
+                   exit_code = 23;
-              while (("readelf -h \"" module "\"" | getline t) > 0) {
+                   exit;
-                  if (match(t, /^  Data: *2\047s complement, little endian$/)) {
+               }
-                      revbytes = 1;
+           }
-                      break;
+           END { exit exit_code }'
+
+        [ 23 = "$?" ] && {
+            kmod_elf_hdr="$(readelf -h "$module")"
+            [ "x$kmod_elf_hdr" = "x${kmod_elf_hdr%Data:*little endian*}" ]
+            revbytes="$?"
+
+            objdump -t "$module" \
+            | awk \
+              -v 'dep_pfx='"$dep_pfx" \
+              -v 'module='"$module" \
+              -v 'revbytes='"$revbytes" \
+              --non-decimal-data \
+              'function readsect(name,   a, t) {
+                  a = "";
+                  while (("readelf -R \"" name "\" \"" module "\"" | getline t) > 0) {
+                      if (match(t, /^  0x[0-9a-f]{8}/))
+                          a = a substr(t, 14, 8) substr(t, 23, 8) substr(t, 32, 8) substr(t, 41, 8);
                   }
+                  if (revbytes) { a = gensub(/(..)(..)(..)(..)/, "\\4\\3\\2\\1", "g", a); }
+                  sectdata[name] = a;
               }
 
-              return revbytes;
+              match($0, /^([0-9a-f]+) [gl]...... (.*)	[0-9a-f]+ __crc_(.*)$/, a) {
-          }
-
-          function readsect(name,   a, t) {
-              a = "";
-              while (("readelf -R \"" name "\" \"" module "\"" | getline t) > 0) {
-                  if (match(t, /^  0x[0-9a-f]{8}/))
-                      a = a substr(t, 14, 8) substr(t, 23, 8) substr(t, 32, 8) substr(t, 41, 8);
-              }
-              if (revbytes) { a = gensub(/(..)(..)(..)(..)/, "\\4\\3\\2\\1", "g", a); }
-              sectdata[name] = a;
-          }
-
-          match($0, /^([0-9a-f]+) [gl]...... (.*)	[0-9a-f]+ __crc_(.*)$/, a) {
-              if (a[2] == "*ABS*") {
-                  printf("%s(%s) = 0x%08x\n", dep_pfx, a[3], strtonum("0x" a[1]));
-              } else {
                   if (!(a[2] in sectdata)) { readsect(a[2]) }
                   printf("%s(%s) = 0x%08s\n", dep_pfx, a[3], substr(sectdata[a[2]], (strtonum("0x" a[1]) * 2) + 1, 8))
-              }
+              }'
-          }'
+        }
 
         [ -z "$tmpfile" ] || rm -f -- "$tmpfile"
     done \
@@ -177,12 +186,9 @@ if [ ${#modules[@]} -gt 0 ]; then
     join -t $'\t' -j 1 -v 2 $symvers "$mod_req" | sort -u \
     | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print "ksym(" $1 ") = " $2 }'
 
-    os_id=$(sed -nr '/^ID[[:space:]]*=/{ s/ID[[:space:]]*=[[:space:]]*//; s/^"(.*)"$/\1/; p }' /etc/os-release)
+    # Check kABI if the kabi-stablelists package is installed
-    if [ "rhel" = "$os_id" ]; then
+    # Do this last so we can try to output this error at the end
-        # Check kABI if the kabi-stablelists package is installed
+    kabi_check_symbols=($(join -t $'\t' -j 1 $symvers "$mod_req" | sort -u \
-        # Do this last so we can try to output this error at the end
+    | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print $1 }'))
-        kabi_check_symbols=($(join -t $'\t' -j 1 $symvers "$mod_req" | sort -u \
+    check_kabi "${kabi_check_symbols[@]}"
-        | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print $1 }'))
-        check_kabi "${kabi_check_symbols[@]}"
-    fi
 fi

SOURCES/kmod.attr

@@ -1,54 +1,31 @@
 %__kmod_path           ^/lib/modules/.*/(modules.builtin|.*\.ko|.*\.ko\.gz|.*\.ko\.bz2|.*\.ko\.xz|.*\.ko\.zst)$
-
-# Notes on Lua:
-# The backslash in strings (like "\n" newline) needs to be doubled
-# because we are inside rpm macro. Single backslashes before most chars
-# disappear (removed by rpm's parser), so "\n" turns into just "n".
-# In string.gsub patterns, unlike regexps, backslash has no special meaning.
-# It can't escape . and such. (Use one-character set [.] to represent
-# literal period, or lua's percent escape: %.)
-# Pipe (|) has no special meaning too.
-
 %__kmod_provides() %{lua:
   function basename(fn)
-      local b = string.gsub(fn, ".*/", "")
+      return string.gsub(fn, "(.*/)(.*)", "%2")
-      -- the above adjusts gsub() result to 1 value
-      -- "return f()" construct would return _all_ values, two in case of gsub()
-      return b
   end
   function strip_compress_sfx(fn)
-      local cnt
+      return string.gsub(fn, "(.*)(\.gz|\.bz2|\.xz|\.zst)?$", "%1")
-      fn, cnt = string.gsub(fn, "%.gz$", "")
-      if cnt == 1 then return fn; end
-      fn, cnt = string.gsub(fn, "%.bz2$", "")
-      if cnt == 1 then return fn; end
-      fn, cnt = string.gsub(fn, "%.xz$", "")
-      if cnt == 1 then return fn; end
-      fn, cnt = string.gsub(fn, "%.zst$", "")
-      return fn
   end
   function printdep(mod)
       print("kmod("..mod..") ")
   end
-  local fn = rpm.expand("%1")
+  local fn = rpm.expand("%{1}")
   local bn = basename(fn)
   if bn == "modules.builtin" then
       for l in io.lines(fn) do
           local builtin_mod = basename(l)
           printdep(builtin_mod)
-          local nocompr = strip_compress_sfx(builtin_mod)
+          if strip_compress_sfx(builtin_mod) ~= builtin_mod then
-          if nocompr ~= builtin_mod then
+              printdep(strip_compress_sfx(builtin_mod))
-              printdep(nocompr)
           end
       end
   else
-      local mod = string.match(bn, "%g+%.ko")
+      local mod = string.match(bn, "%g+.ko")
       if mod then
-          printdep(mod)
+         printdep(mod)
-          local nocompr = strip_compress_sfx(mod)
+         if strip_compress_sfx(mod) ~= mod then
-          if nocompr ~= mod then
+             printdep(strip_compress_sfx(mod))
-              printdep(nocompr)
+         end
-          end
       end
   end
 }

SOURCES/macros.kernel-srpm

@@ -1,3 +1,3 @@
 # kernel_arches lists what arches the full kernel is built for.
 
-%kernel_arches x86_64 s390x ppc64le aarch64 %{arm} riscv64
+%kernel_arches x86_64 s390x ppc64le aarch64 %{arm}

SOURCES/macros.kmp

@@ -13,7 +13,7 @@ redhat_kmp_has_post_hooks	1
 #                      [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ...
 
 %kernel_module_package_buildreqs	%global kmodtool_generate_buildreqs 1 \
-					kernel-devel redhat-rpm-config kernel-rpm-macros elfutils-libelf-devel kmod
+					kernel-devel kernel-abi-stablelists redhat-rpm-config kernel-rpm-macros elfutils-libelf-devel kmod
 
 %kernel_module_package(n:v:r:s:f:xp:) %{expand:%( \
 	## An ugly hack: we want kmods to be processed by find-debuginfo,

SOURCES/modalias.prov

@@ -26,15 +26,13 @@ if ! [ -z "$is_kernel_package" ]; then
     exit 0
 fi
 
-# Check for presence of the commands used.
+# Check for presence of the commands used
-# "command" is a builtin, faster to use than fork+execing "which" - see
+which /sbin/modinfo >/dev/null || exit 0
-# https://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
+which sed >/dev/null || exit 0
-command -v /sbin/modinfo >/dev/null || exit 1
+which sort >/dev/null || exit 0
-command -v sed >/dev/null || exit 1
-command -v sort >/dev/null || exit 1
 
 print_modaliases() {
-    local class="$1" variants="$2" pos="$3"
+    declare class=$1 variants=$2 pos=$3
     if [ -n "$variants" ]; then
 	echo "${class:0:pos}[$variants]${class:pos+1}"
     else
@@ -42,87 +40,39 @@ print_modaliases() {
     fi
 }
 
-# Try to make "provides" list a bit smaller:
-# find "mergeable" strings a-la
-# modalias(pci:v0000168Cd00000023sv*sd*bc*sc*i*)
-# modalias(pci:v0000168Cd00000024sv*sd*bc*sc*i*)
-# modalias(pci:v0000168Cd00000027sv*sd*bc*sc*i*)
-# modalias(pci:v0000168Cd00000029sv*sd*bc*sc*i*)
-# replace with
-# modalias(pci:v0000168Cd0000002[3479]sv*sd*bc*sc*i*)
 combine_modaliases() {
-    local unused_len next prev variants="" pos="" n end xc
+    declare tag class variants="" pos="" n
-
+    read class
-    # Due to set -e, we can exit with exitcode 1 on read EOF
+    while read tag; do
-    # and this makes our caller think we failed. "|| return 0" prevents this:
+	for ((n=0; n<${#class}; n++)); do
-    IFS=' ' read unused_len prev || return 0
+	    if [ "*" != "${class:n:1}" -a \
-
+		 "${class:0:n}" = "${tag:0:n}" -a \
-    # For each line after the first...
+		 "${class:n+1}" = "${tag:n+1}" ] &&
-    while IFS=' ' read unused_len next; do
+	       ( [ -z "$pos" ] || [ $n = $pos ] ); then
-	if [ -z "$pos" ]; then
+		variants="${variants:-${class:n:1}}${tag:n:1}"
-	    # 2nd line: after "modalias(" prefix, for each char in prev line...
+		pos=$n
-	    n=9
-	    end=${#prev}
-	    # TODO speedup? if [ $end != ${#next} ]; then line is not mergeable
-	else
-	    # 3rd+ lines: only check the char at the same position
-	    n=$pos
-	    end=$((pos + 1))
-	fi
-	# Search for aaaNbbb,aaaMbbb line pair, where N and M chars differ.
-	# sort -u guarantees there are no identical line pairs.
-	# We assume that lines will not differ only in " = version" suffix.
-	for ((; n < $end; n++)); do
-	    if [ "${prev:0:n}" != "${next:0:n}" ]; then
-		# the prefixes already aren't the same: break
-		n=$end
 		break
 	    fi
-	    # If suffixes differ, go to next char
-	    [ x"${prev:n+1}" != x"${next:n+1}" ] && continue
-	    # Found aaaNbbb,aaaMbbb. If N and M aren't special...
-	    xc=x"${prev:n:1}"
-	    [ x"[" = "$xc" -o x"]" = "$xc" ] && continue
-	    [ x"?" = "$xc" -o x"*" = "$xc" ] && continue
-	    xc=x"${next:n:1}"
-	    [ x"[" = "$xc" -o x"]" = "$xc" ] && continue
-	    [ x"?" = "$xc" -o x"*" = "$xc" ] && continue
-	    # Add M (and maybe N) to $variants, go to next line
-	    variants="${variants:-${prev:n:1}}${next:n:1}"
-	    pos=$n
-	    break
 	done
-	if [ $n -eq $end ]; then
+	if [ $n -eq ${#class} ]; then
-	    # This line is not mergeable with the previous one(s),
+	    print_modaliases "$class" "$variants" "$pos"
-	    # print collected merged line and reset the state
+	    variants=
-	    print_modaliases "$prev" "$variants" "$pos"
+	    pos=
-	    variants=""
+	    class=$tag
-	    pos=""
-	    prev=$next
 	fi
     done
-    # Print last collected merged line
+    print_modaliases "$class" "$variants" "$pos"
-    print_modaliases "$prev" "$variants" "$pos"
 }
 
 for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do
-    modver=$(/sbin/modinfo -F version "$module")
+    # | head -n1 because some modules have *two* version tags. *cough*b44*cough*
-    # delete possible extra lines because some modules have *two* version tags. *cough*b44*cough*
+    modver=$(/sbin/modinfo -F version "$module"| head -n1)
-    modver=${modver%%$'\n'*}    # using $'' bashism, avoid running "head -n1" process
+    modver=${modver//[^0-9a-zA-Z._]/_}
-    # replace any strange chars with underscores.
+    # only add version tag if it has a version
-    # [!...] is glob's "match any char not in set" pattern
-    # (although bash supports [^...] too, it is not standard)
-    modver=${modver//[!0-9a-zA-Z._]/_}
-    # only add version tag if it indeed has a version
     [ -z "$modver" ] || modver=" = $modver"
 
     /sbin/modinfo -F alias "$module" \
-    | sed -E "s,[^][0-9a-zA-Z._:*?/-],_,g; s,(.+),modalias(\\1)$modver,"
+    | sed -nre "s,[^][0-9a-zA-Z._:*?/-],_,g; s,(.+),modalias(\\1)$modver,p"
-
-    # Below: combining code can only possibly combine lines of equal length.
-    # Prepend line lengths before sort, so that same-length lines end up next
-    # to each other. (The lengths are discarded by combine_modaliases).
 done \
-| { while read line; do echo "${#line} $line"; done } \
+| sort -u \
-| LC_ALL=C sort -u \
 | combine_modaliases

SPECS/kernel-srpm-macros.spec

@@ -1,7 +1,6 @@
 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:        13%{?dist}
-Release:        25%{?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
@@ -11,10 +10,10 @@ License:        MIT
 URL:            https://src.fedoraproject.org/rpms/kernel-srpm-macros
 BuildArch:      noarch
 # We are now the ones shipping kmod.attr
-Conflicts:      redhat-rpm-config < 205
+Conflicts:      redhat-rpm-config <= 184
 # macros.kmp, kmodtool and rpmsort were moved from kernel-rpm-macros
 # to kernel-srpm-macros in 1.0-9/185-9
-Conflicts:      kernel-rpm-macros < 205
+Conflicts:      kernel-rpm-macros < 185-9
 
 # Macros
 Source0:        macros.kernel-srpm
@@ -54,11 +53,10 @@ the full kernel is built on.
 The variable to use is kernel_arches.
 
 %package -n kernel-rpm-macros
-Version: 205
+Version: 185
+Release: %{release}
 Summary: Macros and scripts for building kernel module packages
-# rpmsort is GPL-2.0-or-later
+Requires: redhat-rpm-config >= 13
-License:        MIT AND GPL-2.0-or-later
-Requires: redhat-rpm-config >= 205
 
 # for brp-kmod-compress
 Requires: %{_bindir}/xz
@@ -115,10 +113,12 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
 
 %files
 %{_rpmconfigdir}/macros.d/macros.kernel-srpm
+%{_rpmconfigdir}/macros.d/macros.kmp
 %{_fileattrsdir}/kmod.attr
+%{rrcdir}/kmodtool
+%{rrcdir}/rpmsort
 
 %files -n kernel-rpm-macros
-%{_rpmconfigdir}/macros.d/macros.kmp
 %{_rpmconfigdir}/kabi.sh
 %{_fileattrsdir}/kabi.attr
 %{_fileattrsdir}/modalias.attr
@@ -132,86 +132,52 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
 %{rrcdir}/find-requires.ksyms
 %{rrcdir}/find-provides.d/firmware.prov
 %{rrcdir}/find-provides.d/modalias.prov
-%{rrcdir}/kmodtool
-%{rrcdir}/rpmsort
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.0-25
+* Mon Jun 12 2023 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-13
-- Bump release for October 2024 mass rebuild:
+- Handle symvers.xz in kabi.attr (#2209253).
-  Resolves: RHEL-64018
+- Fix indirect __crc_* sumbols parsing in find-provides.ksyms
-
+  and find-requires.ksyms to avoid matching multiple sections
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.0-24
+  producing bogus duplicate provides for kmods that have both __kcrctab
-- Rebuilt for MSVSphere 10
+  and __kcrctab_gpl sections (#2115811, #2178935).
-
+- Call "readelf -R" on a correct section in find-requires.ksyms.
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.0-24
+- Rewrite section data extraction in find-provides.ksyms and find-requires.ksyms
-- Bump release for June 2024 mass rebuild
+  to avoid garbage at the end of extracted sections, causing unnecessary awk
-
+  complaints (#2115811).
-* Wed Mar 06 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1.0-23
+- Perform section parsing inside the awk script in find-provides.ksyms
-- Add riscv64
+  and find-requires.ksyms to avoid hitting command line argument limit
-
+  when handling large .rodata sections (#2178935).
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-22
+
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Tue Jan 31 2023 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-12
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 09 2023 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-19
-- Capture local __crc_* symbols for "Provides: kernel()".
-- Add support for XZ compression for the symvers file.
-- Fix "Provides: kernel()" generation when both __kcrctab and __kcrctab_gpl
-  are present.
-- Fix regression for "Provides:" generation in cases when modversions are stored
-  in a section that is over 64K in size.
-- Speedup and cleanup changes in find-provides.ksyms and find-requires.ksyms.
-- Fix regex usage in kmod.attr. (Denys Vlasenko)
-- Implement modalias "Provides:" grouping. (Denys Vlasenko)
-- Speedup and cleanup changes in modalias.prov and kmod.attr. (Denys Vlasenko)
-
-* Tue Mar 30 2023 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-18
-- Avoid triggering debuginfod during elfutils tools usage.
-
-* Tue Jan 31 2023 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-17
 - Support storing of __crc_* symbols in sections other than .rodata.
-- Work around a change in type of __crc_* symbols for some kmods printed by nm
+- Resolves: #2135047
-  on ppc64le and s390x.
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-14
+* Thu Feb 17 2022 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Work around a change in type of __crc_* symbols for some kmods printed by nm
-
+  on ppc64le and s390x
-* Thu Nov 18 2021 Miro Hrončok <mhroncok@redhat.com> - 1.0-13
+- Resolves: #2055464
-- Bump kernel-rpm-macros to 205 to provide clear upgrade path
-
-* Thu Nov 18 2021 Miro Hrončok <mhroncok@redhat.com> - 1.0-12
-- Correct conflicts to redhat-rpm-macros < 205
-- Move Perl scripts back to kernel-rpm-macros to avoid Perl in the default buildroot
-
-* Thu Nov 18 2021 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-11
-- Add conflicts of redhat-rpm-macros < 204 as macros.kmp, kmodtool,
-  and rpmsort were moved from the latter to the former.
-- Remove RHEL-specific kABI bits from find-requires.ksyms and macros.kmp.
 
 * 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
   to the former.
 
-* Thu Nov 18 2021 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-9
+* Mon Sep 20 2021 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-9
 - Update scripts with RHEL-specific changes.
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue May 25 2021 Michal Domonkos <mdomonko@redhat.com> - 1.0-7
+- Bump release for a rebuild in a sidetag
+
+* Wed May 12 2021 Michal Domonkos <mdomonko@redhat.com> - 1.0-6
+- Adopt kernel-rpm-macros subpackage & kmod.attr from redhat-rpm-config
+- Resolves: #1959914
 
-* Thu Jun 03 2021 Michal Domonkos <mdomonko@redhat.com> - 1.0-5
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-5
-- Adopt kernel-rpm-macros & kmod.attr subpackage from redhat-rpm-config
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild