From a553de1c74e8ad8718116f9c188bea659e05f950 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Mon, 22 May 2023 14:15:23 +0200 Subject: [PATCH] find-provides.ksyms: factor out the output sorting To bring it more in line with the implementation in find-requires.ksyms. Resolves: #2178935 Signed-off-by: Eugene Syromiatnikov --- find-provides.ksyms | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/find-provides.ksyms b/find-provides.ksyms index 366850a..c7f593c 100755 --- a/find-provides.ksyms +++ b/find-provides.ksyms @@ -43,8 +43,7 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do | awk \ -v 'dep_pfx='"$dep_pfx" \ --non-decimal-data \ - 'match($0, /^([0-9a-f]+) A __crc_(.+)/, a) { printf("%s(%s) = 0x%08x\n", dep_pfx, a[2], strtonum("0x" a[1])) }' \ - | sort -u + 'match($0, /^([0-9a-f]+) A __crc_(.+)/, a) { printf("%s(%s) = 0x%08x\n", dep_pfx, a[2], strtonum("0x" a[1])) }' else objdump -t "$module" \ | sed -n 's/^[0-9a-f][0-9a-f]* [gl]...... \(.*\) [0-9a-f][0-9a-f]* __crc_.*$/\1/p' \ @@ -66,9 +65,9 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do -v 'sectname='"$sectname" \ --non-decimal-data \ 'match($0, /^([0-9a-f]+) [gl]...... (.*) [0-9a-f]+ __crc_(.*)$/, a) && a[2] == sectname { printf("%s(%s) = 0x%08s\n", dep_pfx, a[3], substr(sectdata, (strtonum("0x" a[1]) * 2) + 1, 8)) }' - done \ - | sort -u + done fi [ -z "$tmpfile" ] || rm -f -- "$tmpfile" -done +done \ +| sort -k1,1 -u