rpms/kmod
7
0
Fork 0
Code Issues Pull Requests Releases Activity

weak-modules: add symvers.xz support

Browse Source 
Check for symvers.xz support in addition to symvers.gz,
due to unnanounced unilateral change[1][2] in the kernel packaging.

[1] 2644665657
[2] 2db77a072a

* weak-modules (make_kernel_file_names): Interpret all arguments after
the second as a list of suffixes, iterate over them
(find_kernel_file): Switch print and suffix arguments, interpret all
argument after print as suffixes, pass them to make_kernel_file_names.
(find_symvers_file): Update the order of arguments in the
find_kernel_file call, add .xz suffix in addition to .gz.
(find_systemmap_file): Update the order of arguments in the
find_kernel_file call.

Resolves: rhbz#2192895
Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
This commit is contained in:
Eugene Syromiatnikov 2023-05-09 09:11:45 +02:00
parent 2815bad792
commit 6b0aa4e785
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
weak-modules
View File

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