diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/kmod.spec b/kmod.spec index c07450ccf193f75fc439e8fe21de98ac69f29ee5..a4609a6618d37023eff4dd41222d1249d2160cb5 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,8 +1,8 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 Name: kmod Version: 25 -Release: 19%{anolis_release}%{?dist} +Release: 20%{anolis_release}%{?dist} Summary: Linux kernel module management utilities Group: System Environment/Kernel @@ -155,11 +155,13 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %doc NEWS README TODO %changelog -* Thu May 25 2023 Tianjia Zhang - 25-19.0.2 -- Support SM3 hash algorithm - -* Mon Jul 18 2022 Zhao Hang - 25-19.0.1 +* Tue Jul 16 2024 Zhao Hang - 25-20.0.1 - Add doc sub package +- Support SM3 hash algorithm (tianjia.zhang@linux.alibaba.com) + +* Wed Oct 11 2023 Eugene Syromiatnikov - 25-20 +- Add symvers.xz support to weak-modules +- Resolves: RHEL-8903 * Mon Nov 29 2021 Yauheni Kaliuta - 25-19 - depmod: fix parallel execution issues diff --git a/weak-modules b/weak-modules index 2b162757689a017fcffa00a88e98c9864a368b33..2aeb9d41a42302c3a696ffa60da71dfceef93cfb 100644 --- a/weak-modules +++ b/weak-modules @@ -520,26 +520,31 @@ finish_sandbox() { # Auxiliary functions to find symvers file make_kernel_file_names() { local krel="$1" - local file="$2" - local suffix="$3" + shift + local file="$1" + shift - echo "${BASEDIR}/boot/${file}-${krel}${suffix}" - echo "${BASEDIR}/lib/modules/${krel}/${file}${suffix}" + for suffix in "$@"; do + echo "${BASEDIR}/boot/${file}-${krel}${suffix}" + echo "${BASEDIR}/lib/modules/${krel}/${file}${suffix}" + done } find_kernel_file() { local krel="$1" - local file="$2" - local suffix="$3" - local print="$4" + shift + local file="$1" + shift + local print="$1" + shift local i if [[ "$print" != "" ]]; then - make_kernel_file_names "$krel" "$file" "$suffix" + make_kernel_file_names "$krel" "$file" "$@" return 0 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 echo "$i" return 0 @@ -563,7 +568,7 @@ find_symvers_file() { local krel="$1" local print="$2" - find_kernel_file "$krel" symvers .gz "$print" + find_kernel_file "$krel" symvers "$print" .xz .gz } # find_systemmap_file: @@ -573,7 +578,7 @@ find_systemmap_file() { local print="$2" local no_suffix="" - find_kernel_file "$krel" System.map "$no_suffix" "$print" + find_kernel_file "$krel" System.map "$print" "$no_suffix" } #### Main logic