From 6bc05248ecd11d627d6c359e537719a345846640 Mon Sep 17 00:00:00 2001
From: Eugene Syromiatnikov <esyr@redhat.com>
Date: Wed, 17 Nov 2021 16:29:49 +0100
Subject: [PATCH] Improve Provides: kernel() generation for built-in modules

After split of the kmods into a separate packages (like kernel-modules
and kernel-modules-extra), kernel() provides for the inbox kmods are generated
for incorrect package, as they were handled by kabi.sh that uses symvers
as a basis for the dependency list.  Stop using it for kmod dependencies
(but continue using it for the symbols provided by vmlinux itself) and
employ find-provides.sh for that purpose.

* kabi.sh: Filter only those symbols that are exported by vmlinux.
* find-provides.ksyms: Generate tags with the "kernel" prefix for kernel
modules inside /lib/modules/[1-9][^/]*/kernel.

Resolves: #1942563
Resolves: #1975927
Resolves: #2002887
Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
---
 find-provides.ksyms | 9 +++++++--
 kabi.sh             | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/find-provides.ksyms b/find-provides.ksyms
index 796a090..479e634 100755
--- a/find-provides.ksyms
+++ b/find-provides.ksyms
@@ -3,6 +3,11 @@
 IFS=$'\n'
 
 for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz)?$') "$@"; do
+    dep_pfx="ksym"
+    # For built-in kmods, "kernel()" syntax is used instead of "ksym()"
+    printf "%s" "$module" | grep -v "^${RPM_BUILD_ROOT}/\?lib/modules/[1-9][^/]*/kernel" > /dev/null \
+	|| dep_pfx="kernel"
+
     tmpfile=""
     if [ "x${module%.ko}" = "x${module}" ]; then
         tmpfile=$(mktemp -t ${0##*/}.XXXXXX.ko)
@@ -28,7 +33,7 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz)?$') "$@"; do
     if [[ -n $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then
         nm $module \
         | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \
-        | awk --non-decimal-data '{printf("ksym(%s) = 0x%08x\n", $2, $1)}' \
+        | awk --non-decimal-data '{printf("'"${dep_pfx}"'(%s) = 0x%08x\n", $2, $1)}' \
         | LC_ALL=C sort -u
     else
         ELFRODATA=$(readelf -R .rodata $module | awk '/0x/{printf $2$3$4$5}')
@@ -40,7 +45,7 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz)?$') "$@"; do
         for sym in $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do
             echo $sym $RODATA
         done \
-        | awk --non-decimal-data '{printf("ksym(%s) = 0x%08s\n", $2, substr($3,($1*2)+1,8))}' \
+        | awk --non-decimal-data '{printf("'"${dep_pfx}"'(%s) = 0x%08s\n", $2, substr($3,($1*2)+1,8))}' \
         | LC_ALL=C sort -u
     fi
 
diff --git a/kabi.sh b/kabi.sh
index 59b2b86..3fb749b 100644
--- a/kabi.sh
+++ b/kabi.sh
@@ -9,5 +9,8 @@ IFS=$'\n'
 
 for symvers in $(grep -E '(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.gz') "$@";
 do
-    zcat $symvers | awk ' {print "kernel(" $2 ") = " $1 }'
+	# We generate dependencies only for symbols exported by vmlinux itself
+	# and not for kmods here as they are spread across subpackages,
+	# so Provides: generation for kmods is handled by find-provides.ksyms.
+	zcat $symvers | awk '/[^	]*	[^	]*	vmlinux	.*/ { print "kernel(" $2 ") = " $1 }'
 done