From 18f7244e036e6a8646c706d01aadf8fe3826ec4a Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 29 Jan 2025 15:58:04 +0100 Subject: [PATCH] Revert "Remove support for the MD linear RAID level" Resolves: RHEL-76808 --- ...support-for-the-MD-linear-RAID-level.patch | 23 ------------------- python-blivet.spec | 19 ++++++++------- 2 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 0006-Remove-support-for-the-MD-linear-RAID-level.patch diff --git a/0006-Remove-support-for-the-MD-linear-RAID-level.patch b/0006-Remove-support-for-the-MD-linear-RAID-level.patch deleted file mode 100644 index 2e9a57d..0000000 --- a/0006-Remove-support-for-the-MD-linear-RAID-level.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a21c4fa61f75f6c900f152651308ac9b457a62da Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Thu, 23 May 2024 15:31:47 +0200 -Subject: [PATCH] Remove support for the MD linear RAID level - -The md-linear kernel module is deprecated and will be removed in -the future. ---- - blivet/devicelibs/mdraid.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py -index 3b60c87c4..0ef3d0a4f 100644 ---- a/blivet/devicelibs/mdraid.py -+++ b/blivet/devicelibs/mdraid.py -@@ -45,6 +45,6 @@ def is_raid_level(cls, level): - hasattr(level, 'get_size') - - --raid_levels = MDRaidLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10", "linear"]) -+raid_levels = MDRaidLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10"]) - - EXTERNAL_DEPENDENCIES = [availability.BLOCKDEV_MDRAID_PLUGIN] diff --git a/python-blivet.spec b/python-blivet.spec index 5acc96f..b861147 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -5,7 +5,7 @@ Version: 3.10.0 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 14%{?prerelease}%{?dist} +Release: 15%{?prerelease}%{?dist} Epoch: 1 License: LGPL-2.1-or-later %global realname blivet @@ -21,13 +21,12 @@ Patch1: 0002-Fix-skipping-btrfs-calls-when-libblockdev-btrfs-plugin-is-missing.p Patch2: 0003-XFS-resize-test-fix.patch Patch3: 0004-Run-mkfs-xfs-with-force-option-by-default.patch Patch4: 0005-consolidated-s390-device-configuration.patch -Patch5: 0006-Remove-support-for-the-MD-linear-RAID-level.patch -Patch6: 0007-Fix-checking-for-NVMe-plugin-availability.patch -Patch7: 0008-Align-sizes-up-for-growable-LVs.patch -Patch8: 0009-mod_pass_in_stratis_test.patch -Patch9: 0010-Fix_running_tests_in_FIPS_mode.patch -Patch10: 0011-Make-GPT-default-label-type-on-all-architectures.patch -Patch11: 0012-Fix-crash-on-ppc64le-with-GPT.patch +Patch5: 0007-Fix-checking-for-NVMe-plugin-availability.patch +Patch6: 0008-Align-sizes-up-for-growable-LVs.patch +Patch7: 0009-mod_pass_in_stratis_test.patch +Patch8: 0010-Fix_running_tests_in_FIPS_mode.patch +Patch9: 0011-Make-GPT-default-label-type-on-all-architectures.patch +Patch10: 0012-Fix-crash-on-ppc64le-with-GPT.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -122,6 +121,10 @@ make DESTDIR=%{buildroot} install %{python3_sitelib}/* %changelog +* Wed Jan 29 2025 Vojtech Trefny - 3.10.0-15 +- Revert "Remove support for the MD linear RAID level" + Resolves: RHEL-76808 + * Thu Dec 05 2024 Vojtech Trefny - 3.10.0-14 - Fix crash on ppc64le with GPT Resolves: RHEL-70153