From 2b18c24244eb2473ae35ad349029f4a45bb23b21 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 14 Aug 2025 09:05:44 +0000 Subject: [PATCH] import OL kmod-kvdo-8.2.5.14-163.0.1.el9_6 --- .gitignore | 2 +- .kmod-kvdo.metadata | 2 +- SOURCES/mod-sign.sh | 21 +++++++ SPECS/kmod-kvdo.spec | 136 ++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 152 insertions(+), 9 deletions(-) create mode 100755 SOURCES/mod-sign.sh diff --git a/.gitignore b/.gitignore index fcee11c..dd5ba0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/kvdo-7c54552.tar.gz +SOURCES/kvdo-e2e769f.tar.gz diff --git a/.kmod-kvdo.metadata b/.kmod-kvdo.metadata index f4c1467..5e0a1aa 100644 --- a/.kmod-kvdo.metadata +++ b/.kmod-kvdo.metadata @@ -1 +1 @@ -07a986b6e0aaf9c7225b586e4b4553b363077479 SOURCES/kvdo-7c54552.tar.gz +bab61ef8092641dfbece6414a38ac60cbe91cbf9 SOURCES/kvdo-e2e769f.tar.gz diff --git a/SOURCES/mod-sign.sh b/SOURCES/mod-sign.sh new file mode 100755 index 0000000..925bb26 --- /dev/null +++ b/SOURCES/mod-sign.sh @@ -0,0 +1,21 @@ +#! /bin/bash + +# Sign every .ko module file from given directory using /usr/bin/sign-file script +# if latter available on the file system. +# +# Format: +# +# ./mod-sign.sh +# + +moddir=$1 + +if ! test -f /usr/bin/sign-file ; then + echo "No /usr/bin/sign-file available. " + exit 0 +fi + +find "$moddir" -name '*.ko' -print0 | while read -r -d $'\0' mod; do + /usr/bin/sign-file "$mod" "$mod".signed + mv -f "$mod".signed "$mod" +done diff --git a/SPECS/kmod-kvdo.spec b/SPECS/kmod-kvdo.spec index 11c5fe2..0c2cb65 100644 --- a/SPECS/kmod-kvdo.spec +++ b/SPECS/kmod-kvdo.spec @@ -1,21 +1,34 @@ -%global commit 7c5455297c90653c85fb9f99aa1fe3f5b8008966 -%global gittag 8.2.4.15 +%global commit e2e769fd32a22402bb6c4cbfcbef24edb296c600 +%global gittag 8.2.5.14 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%define spec_release 141 +%define spec_release 163 %define kmod_name kvdo %define kmod_driver_version %{gittag} -%define kmod_rpm_release %{spec_release} -%define kmod_kernel_version 5.14.0-503.4.1.el9_5 +%define kmod_rpm_release %{spec_release}.0.1 +%define kmod_kernel_version 5.14.0-570.el9 %define kmod_kernel_extra %(sed 's/.*-\\([0-9]\\+\\).*/\\1/' <<< "%{kmod_kernel_version}") %define kmod_headers_version %(rpm -qa kernel-devel | sed 's/^kernel-devel-//') %define kmod_kbuild_dir . %define kmod_devel_package 0 +%define _signmodules %{?signmodules: %{signmodules}} %{?!signmodules: 1} Source0: https://github.com/dm-vdo/%{kmod_name}/archive/%{commit}/%{kmod_name}-%{shortcommit}.tar.gz Patch0: add_lz4_dependency.patch Patch1: removed-logical-space-check-from-table-line.patch +%if %{_signmodules} +Source50: mod-sign.sh +%define modsign_cmd %{SOURCE50} +%define __modsign_install_post \ + %{modsign_cmd} \${RPM_BUILD_ROOT} +%define __spec_install_post \ + %{?__debug_package:%{__debug_install_post}}\ + %{__arch_install_post}\ + %{__os_install_post}\ + %{__modsign_install_post} +%endif + %define findpat %( echo "%""P" ) Name: kmod-kvdo @@ -107,8 +120,8 @@ printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --dracut=/usr/bin/dracu %prep %setup -n %{kmod_name}-%{commit} -%patch0 -p1 -%patch1 -p1 +%patch 0 -p1 +%patch 1 -p1 %{nil} set -- * mkdir source @@ -158,6 +171,115 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 05 2025 Craig Guiller - 8.2.5.14-163.0.1.el9 +- Update for kernel-5.14.0-570.el9 +- add OL signature + +* Wed Jun 25 2025 - Chung Chung - 8.2.5.14-163.el9 +- Rebuilt to correct driver not signed +- Related: RHEL-93002 + +* Wed Jun 25 2025 - Chung Chung - 8.2.5.14-162.el9 +- Rebuilt to correct driver not signed +- Related: RHEL-93002 + +* Fri Jun 06 2025 - Chung Chung - 8.2.5.14-161.el9 +- Clear dedupe_context reference when releasing the context. +- Resolves: RHEL-93002 + +* Fri Feb 14 2025 - Andy Walsh - 8.2.5.10-160.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Mon Feb 10 2025 - Andy Walsh - 8.2.5.10-160.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Wed Feb 05 2025 - Chung Chung - 8.2.5.10-159.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Mon Feb 03 2025 - Chung Chung - 8.2.5.10-158.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Tue Jan 28 2025 - Chung Chung - 8.2.5.10-157.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Mon Jan 27 2025 - Chung Chung - 8.2.5.10-156.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Fri Jan 24 2025 - Chung Chung - 8.2.5.10-155.el9 +- Adapted to backported kernel changes +- Resolves: RHEL-75479 + +* Fri Jan 17 2025 - Chung Chung - 8.2.5.2-155.el9 +- TEMPORARY FIX to correct build failures regarding blk_limits_io_{min,opt} error +- Related: RHEL-61201 + +* Fri Jan 17 2025 - Chung Chung - 8.2.5.2-155.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Thu Dec 19 2024 - Chung Chung - 8.2.5.2-154.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Fri Dec 13 2024 - Chung Chung - 8.2.5.2-153.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Mon Dec 09 2024 - Chung Chung - 8.2.5.2-152.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Fri Nov 29 2024 - Chung Chung - 8.2.5.2-151.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Wed Nov 27 2024 - Andy Walsh - 8.2.5.2-150.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Wed Nov 20 2024 - Chung Chung - 8.2.5.2-149.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Tue Nov 12 2024 - Chung Chung - 8.2.5.2-148.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Fri Nov 08 2024 - Chung Chung - 8.2.5.2-147.el9 +- Fixed discards to use correct size limit. +- Removed spurious metadata assertion. +- Resolves: RHEL-66271 + +* Tue Nov 05 2024 - Chung Chung - 8.2.4.15-147.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Fri Nov 01 2024 - Chung Chung - 8.2.4.15-146.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Wed Oct 30 2024 - Chung Chung - 8.2.4.15-145.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Mon Oct 21 2024 - Chung Chung - 8.2.4.15-144.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Thu Oct 17 2024 - Chung Chung - 8.2.4.15-143.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + +* Mon Oct 07 2024 - Susan LeGendre-McGhee - 8.2.4.15-142.el9 +- Rebuilt for latest kernel. +- Related: RHEL-61201 + * Tue Sep 17 2024 - Susan LeGendre-McGhee - 8.2.4.15-141.el9_5 - Rebuilt for latest kernel. - Related: RHEL-30884