From ddf06740637dd0dae664be253ca632ebc4dfbb56 Mon Sep 17 00:00:00 2001 From: Susan LeGendre-McGhee Date: Tue, 15 Nov 2022 23:22:20 +0000 Subject: [PATCH] Updated to version 8.2.1.2 --- .gitignore | 1 + kmod-kvdo.spec | 12 +++++++----- remove_bdevname.patch | 22 ---------------------- sources | 2 +- 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 remove_bdevname.patch diff --git a/.gitignore b/.gitignore index 6eb314c..9916383 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /kvdo-e209cfe.tar.gz /kvdo-127a993.tar.gz /kvdo-6077a12.tar.gz +/kvdo-883a960.tar.gz diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec index 95074d4..c5d5518 100644 --- a/kmod-kvdo.spec +++ b/kmod-kvdo.spec @@ -1,12 +1,12 @@ -%global commit 6077a128b887100e478048f67e6b8734cddd0ec7 -%global gittag 8.2.0.18 +%global commit 883a960d01c7deb85665855ccc34ea1c8484af10 +%global gittag 8.2.1.2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define spec_release 59 %define kmod_name kvdo %define kmod_driver_version %{gittag} %define kmod_rpm_release %{spec_release} -%define kmod_kernel_version 5.14.0-192.el9 +%define kmod_kernel_version 5.14.0-196.el9 %define kmod_headers_version %(rpm -qa kernel-devel | sed 's/^kernel-devel-//') %define kmod_kbuild_dir . %define kmod_devel_package 0 @@ -14,7 +14,6 @@ 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 -Patch2: remove_bdevname.patch %define findpat %( echo "%""P" ) @@ -108,7 +107,6 @@ printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --dracut=/usr/bin/dracu %setup -n %{kmod_name}-%{commit} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %{nil} set -- * mkdir source @@ -157,6 +155,10 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 15 2022 - Susan LeGendre-McGhee - 8.2.1.2-59.el9_2 +- Adapted to backported kernel changes. +- Resolves: rhbz#2139179 + * Fri Nov 11 2022 - Susan LeGendre-McGhee - 8.2.0.18-59.el9_2 - Rebuilt for latest kernel. - Related: rhbz#2119820 diff --git a/remove_bdevname.patch b/remove_bdevname.patch deleted file mode 100644 index a77d68f..0000000 --- a/remove_bdevname.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur kvdo-6077a128b887100e478048f67e6b8734cddd0ec7.orig/vdo/dm-vdo-target.c kvdo-6077a128b887100e478048f67e6b8734cddd0ec7/vdo/dm-vdo-target.c ---- kvdo-6077a128b887100e478048f67e6b8734cddd0ec7.orig/vdo/dm-vdo-target.c 2022-08-22 15:58:08.000000000 -0400 -+++ kvdo-6077a128b887100e478048f67e6b8734cddd0ec7/vdo/dm-vdo-target.c 2022-10-26 10:47:11.202791018 -0400 -@@ -129,7 +129,6 @@ - struct vdo *vdo = get_vdo_for_target(ti); - struct vdo_statistics *stats; - struct device_config *device_config; -- char name_buffer[BDEVNAME_SIZE]; - /* - * N.B.: The DMEMIT macro uses the variables named "sz", "result", - * "maxlen". -@@ -143,8 +142,8 @@ - vdo_fetch_statistics(vdo, &vdo->stats_buffer); - stats = &vdo->stats_buffer; - -- DMEMIT("/dev/%s %s %s %s %s %llu %llu", -- bdevname(vdo_get_backing_device(vdo), name_buffer), -+ DMEMIT("/dev/%pg %s %s %s %s %llu %llu", -+ vdo_get_backing_device(vdo), - stats->mode, - stats->in_recovery_mode ? "recovering" : "-", - vdo_get_dedupe_index_state_name(vdo->hash_zones), diff --git a/sources b/sources index 5b33413..78b4faf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kvdo-6077a12.tar.gz) = 9414be437dda1045fc1abfdc2222fca51554d188be53d68edc280d2d48ebf9d7d6a9e1f25827b3cc647f9399c8d9d8688bfe2d610e76152d861346998e43c8f2 +SHA512 (kvdo-883a960.tar.gz) = 9e13cb55353eb1a8bad0c07dfc387c6ca4acdf6532a474fc11c1630142a2b72b8eb0182695f5bd066210890e60fefc093193eb7ecf59badda83d09555adb888d