diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec index f3406b0..c58137c 100644 --- a/kmod-kvdo.spec +++ b/kmod-kvdo.spec @@ -1,20 +1,13 @@ %global commit c6254c6db5cfa02ecf5bbb4db2c5728f23aa3b2a %global gittag 8.2.3.3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%define spec_release 106 - -%if (%(rpm -qa kernel-64k | wc -l) == 1) || ("%(uname -r | sed 's/^.*%{_target_cpu}//')" == "+64k") -%global kernel_package_prefix kernel-64k -%global kernel_src_suffix +64k -%else -%global kernel_package_prefix kernel -%endif +%define spec_release 107 %define kmod_name kvdo %define kmod_driver_version %{gittag} %define kmod_rpm_release %{spec_release} -%define kmod_kernel_version 5.14.0-391.el9 -%define kmod_headers_version %(rpm -qa %{kernel_package_prefix}-devel | sed 's/^%{kernel_package_prefix}-devel-//')%{?kernel_src_suffix} +%define kmod_kernel_version 5.14.0-394.el9 +%define kmod_headers_version %(rpm -qa kernel-devel | sed 's/^kernel-devel-//') %define kmod_kbuild_dir . %define kmod_devel_package 0 @@ -33,7 +26,7 @@ URL: http://github.com/dm-vdo/kvdo BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: elfutils-libelf-devel BuildRequires: glibc -BuildRequires: %{kernel_package_prefix}-devel >= %{kmod_kernel_version} +BuildRequires: kernel-devel >= %{kmod_kernel_version} # Disable the kernel-debug requirement for now @@ -50,9 +43,9 @@ ExcludeArch: s390 Provides: kmod-%{kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/weak-modules Requires(postun): %{_sbindir}/weak-modules -Requires: rpm >= 4.13 -Requires: ( kernel-core-uname-r >= %{kmod_kernel_version} or kernel-64k-core-uname-r >= %{kmod_kernel_version} ) -Requires: ( kernel-modules-uname-r >= %{kmod_kernel_version} or kernel-64k-modules-uname-r >= %{kmod_kernel_version} ) +Requires: kernel-core-uname-r >= %{kmod_kernel_version} +Requires: kernel-modules-uname-r >= %{kmod_kernel_version} +Conflicts: kernel-64k %description Virtual Data Optimizer (VDO) is a device mapper target that delivers @@ -163,6 +156,10 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 05 2023 - Susan LeGendre-McGhee - 8.2.1.6-107.el9 +- Revert previous changes and add kernel-64k as a conflict. +- Resolves: RHEL-8354 + * Tue Nov 28 2023 - Susan LeGendre-McGhee - 8.2.1.6-106.el9 - Modify to accommodate kernel-64k packages. - Resolves: RHEL-8354