From 23a36faba0cffeb14f9554ce6f9be56b00a53611 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 17 Sep 2025 13:30:18 +0000 Subject: [PATCH] Revert OL modifications --- SOURCES/mod-sign.sh | 21 --------------------- SPECS/kmod-kvdo.spec | 21 ++------------------- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100755 SOURCES/mod-sign.sh diff --git a/SOURCES/mod-sign.sh b/SOURCES/mod-sign.sh deleted file mode 100755 index 925bb26..0000000 --- a/SOURCES/mod-sign.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /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 3e7665d..6d59909 100644 --- a/SPECS/kmod-kvdo.spec +++ b/SPECS/kmod-kvdo.spec @@ -5,30 +5,17 @@ %define kmod_name kvdo %define kmod_driver_version %{gittag} -%define kmod_rpm_release %{spec_release}.0.1 -%define kmod_kernel_version 5.14.0-570.el9 +%define kmod_rpm_release %{spec_release} +%define kmod_kernel_version 5.14.0-570.37.1.el9_6 %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 @@ -171,10 +158,6 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Sep 16 2025 Darren Archibald - 8.2.5.14-164.0.1.el9_6 -- Update for kernel-5.14.0-570.el9 -- add OL signature - * Tue Aug 19 2025 - Chung Chung - 8.2.5.14-164.el9_6 - Updated the supported kernel version. - Resolves: RHEL-107188