From 7e918435d0583a01d5ad97d5b30abb36aef72a27 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Nov 16 2020 21:40:13 +0000 Subject: RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/python-blivet#d51d6767630b9eb878951d342d0db292b939cb7f --- diff --git a/0001-remove-btrfs-plugin.patch b/0001-remove-btrfs-plugin.patch new file mode 100644 index 0000000..4d67bef --- /dev/null +++ b/0001-remove-btrfs-plugin.patch @@ -0,0 +1,28 @@ +From 8b527ee85b6594d506d445ff4c30579cccef8ae6 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 11 Nov 2020 13:24:55 +0100 +Subject: [PATCH] Remove btrfs from requested libblockdev plugins + +--- + blivet/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/blivet/__init__.py b/blivet/__init__.py +index 14bd5c61..1410d78e 100644 +--- a/blivet/__init__.py ++++ b/blivet/__init__.py +@@ -63,9 +63,9 @@ gi.require_version("BlockDev", "2.0") + from gi.repository import GLib + from gi.repository import BlockDev as blockdev + if arch.is_s390(): +- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm")) ++ _REQUESTED_PLUGIN_NAMES = set(("lvm", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm")) + else: +- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm")) ++ _REQUESTED_PLUGIN_NAMES = set(("lvm", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm")) + + _requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES) + try: +-- +2.26.2 + diff --git a/python-blivet.spec b/python-blivet.spec index 4a3244f..1159c65 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -23,7 +23,7 @@ Version: 3.3.1 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 1%{?prerelease}%{?dist} +Release: 2%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ %global realname blivet @@ -31,6 +31,10 @@ License: LGPLv2+ Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}.tar.gz Source1: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}-tests.tar.gz +%if 0%{?rhel} >= 9 +Patch0: 0001-remove-btrfs-plugin.patch +%endif + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). %global partedver 1.8.1 @@ -191,6 +195,9 @@ configuration. %endif %changelog +* Wed Nov 11 2020 Vojtech Trefny - 3.3.1-2 +- Remove btrfs from requested libblockdev plugins on RHEL 9 + * Tue Oct 20 2020 Vojtech Trefny - 3.3.1-1 - Make sure the product name is safe when using it for device name (vtrefny) - Run packit RPM builds on Fedora ELN (vtrefny)