SOURCES/weak-modules

@@ -520,31 +520,26 @@ finish_sandbox() {
 # Auxiliary functions to find symvers file
 make_kernel_file_names() {
     local krel="$1"
-    shift
-    local file="$1"
-    shift
+    local file="$2"
+    local suffix="$3"
 
-    for suffix in "$@"; do
     echo "${BASEDIR}/boot/${file}-${krel}${suffix}"
     echo "${BASEDIR}/lib/modules/${krel}/${file}${suffix}"
-    done
 }
 
 find_kernel_file() {
     local krel="$1"
-    shift
-    local file="$1"
-    shift
-    local print="$1"
-    shift
+    local file="$2"
+    local suffix="$3"
+    local print="$4"
     local i
 
     if [[ "$print" != "" ]]; then
-        make_kernel_file_names "$krel" "$file" "$@"
+        make_kernel_file_names "$krel" "$file" "$suffix"
         return 0
     fi
 
-    for i in  $(make_kernel_file_names "$krel" "$file" "$@"); do
+    for i in  $(make_kernel_file_names "$krel" "$file" "$suffix"); do
         if [[ -r "$i" ]]; then
             echo "$i"
             return 0
@@ -568,7 +563,7 @@ find_symvers_file() {
     local krel="$1"
     local print="$2"
 
-    find_kernel_file "$krel" symvers "$print" .xz .gz
+    find_kernel_file "$krel" symvers .gz "$print"
 }
 
 # find_systemmap_file:
@@ -578,7 +573,7 @@ find_systemmap_file() {
     local print="$2"
     local no_suffix=""
 
-    find_kernel_file "$krel" System.map "$print" "$no_suffix"
+    find_kernel_file "$krel" System.map "$no_suffix" "$print"
 }
 
 #### Main logic

SPECS/kmod.spec

@@ -1,6 +1,6 @@
 Name:		kmod
 Version:	25
-Release:	20%{?dist}
+Release:	19%{?dist}
 Summary:	Linux kernel module management utilities
 
 Group:		System Environment/Kernel
@@ -129,10 +129,6 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf
 %{_libdir}/libkmod.so
 
 %changelog
-* Wed Oct 11 2023 Eugene Syromiatnikov <esyr@redhat.com> - 25-20
-- Add symvers.xz support to weak-modules
-- Resolves: RHEL-8903
-
 * Mon Nov 29 2021 Yauheni Kaliuta <ykaliuta@redhat.com> - 25-19
 - depmod: fix parallel execution issues
   Resolves: rhbz#2026938