From 3e0b366ad92d285cf436ca004e4638d3085541a9 Mon Sep 17 00:00:00 2001 From: David Lehman Date: Thu, 3 May 2018 12:50:25 -0400 Subject: [PATCH] Add 'nvdimm' tag for NVDIMM namespaces (vtrefny) Add test for NVDIMMNamespaceDevicePopulator (vtrefny) Add populator helper for NVDIMM namespaces (vtrefny) Add 'NVDIMMNamespaceDevice' device representing NVDIMM namespaces (vtrefny) Add a function for identifying NVDIMM namespaces (vtrefny) Add a singleton for NVDIMM namespaces management (vtrefny) Add NVDIMM plugin to list of requested plugins (vtrefny) --- .gitignore | 1 + python-blivet.spec | 95 +++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index b6b7d9e..e8ad0bb 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ /blivet-2.1.10.tar.gz /blivet-2.1.11.tar.gz /blivet-3.0.0.b1.tar.gz +/blivet-3.1.0.b1.tar.gz diff --git a/python-blivet.spec b/python-blivet.spec index f31c2a1..28f1353 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -18,29 +18,18 @@ Summary: A python module for system storage configuration Name: python-blivet -Url: https://www-rhstorage.rhcloud.com/projects/blivet -Version: 3.0.0 +Url: https://storageapis.wordpress.com/projects/blivet +Version: 3.1.0 %global prerelease .b1 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 0.7%{?prerelease}%{?dist} +Release: 0.1%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries %global realname blivet %global realversion %{version}%{?prerelease} Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}.tar.gz -Patch0: 0001-Dasd-is-a-valid-label-type-on-s390x.patch -Patch1: 0002-Do-not-try-to-update-potfile-during-make-all.patch -Patch2: 0003-Allow-device-specification-by-node-to-udev.get_devic.patch -Patch3: 0004-Don-t-use-a-wwn-kwarg-for-MDBiosRaidArrayDevice-1557.patch - -Patch4: 0001-Add-NVDIMM-plugin-to-list-of-requested-plugins.patch -Patch5: 0002-Add-a-singleton-for-NVDIMM-namespaces-management.patch -Patch6: 0003-Add-a-function-for-identifying-NVDIMM-namespaces.patch -Patch7: 0004-Add-NVDIMMNamespaceDevice-device-representing-NVDIMM.patch -Patch8: 0005-Add-populator-helper-for-NVDIMM-namespaces.patch -Patch10: 0007-Add-nvdimm-tag-for-NVDIMM-namespaces.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -86,7 +75,19 @@ Requires: parted >= %{partedver} Requires: python3-pyparted >= %{pypartedver} Requires: libselinux-python3 Requires: python3-blockdev >= %{libblockdevver} -Requires: libblockdev-plugins-all >= %{libblockdevver} +Recommends: libblockdev-btrfs >= %{libblockdevver} +Recommends: libblockdev-crypto >= %{libblockdevver} +Recommends: libblockdev-dm >= %{libblockdevver} +Recommends: libblockdev-fs >= %{libblockdevver} +Recommends: libblockdev-kbd >= %{libblockdevver} +Recommends: libblockdev-loop >= %{libblockdevver} +Recommends: libblockdev-lvm >= %{libblockdevver} +Recommends: libblockdev-mdraid >= %{libblockdevver} +Recommends: libblockdev-mpath >= %{libblockdevver} +Recommends: libblockdev-nvdimm >= %{libblockdevver} +Recommends: libblockdev-part >= %{libblockdevver} +Recommends: libblockdev-swap >= %{libblockdevver} +Recommends: libblockdev-s390 >= %{libblockdevver} Requires: python3-bytesize >= %{libbytesizever} Requires: util-linux >= %{utillinuxver} Requires: lsof @@ -97,8 +98,8 @@ Requires: %{realname}-data = %{epoch}:%{version}-%{release} Obsoletes: blivet-data < 1:2.0.0 %if %{without python2} -Obsoletes: python2-blivet < 1:3.0.0-0.6 -Obsoletes: python-blivet < 1:3.0.0-0.6 +Obsoletes: python2-blivet < 1:2.0.2-2 +Obsoletes: python-blivet < 1:2.0.2-2 %else Obsoletes: python-blivet < 1:2.0.0 %endif @@ -116,12 +117,7 @@ Summary: A python2 package for examining and modifying storage configuration. BuildRequires: gettext BuildRequires: python2-devel - -%if %{is_rhel} -BuildRequires: python-setuptools -%else BuildRequires: python2-setuptools -%endif Requires: python2 Requires: python2-six @@ -130,20 +126,27 @@ Requires: parted >= %{partedver} Requires: python2-pyparted >= %{pypartedver} Requires: python2-libselinux Requires: python2-blockdev >= %{libblockdevver} -Requires: libblockdev-plugins-all >= %{libblockdevver} +Recommends: libblockdev-btrfs >= %{libblockdevver} +Recommends: libblockdev-crypto >= %{libblockdevver} +Recommends: libblockdev-dm >= %{libblockdevver} +Recommends: libblockdev-fs >= %{libblockdevver} +Recommends: libblockdev-kbd >= %{libblockdevver} +Recommends: libblockdev-loop >= %{libblockdevver} +Recommends: libblockdev-lvm >= %{libblockdevver} +Recommends: libblockdev-mdraid >= %{libblockdevver} +Recommends: libblockdev-mpath >= %{libblockdevver} +Recommends: libblockdev-nvdimm >= %{libblockdevver} +Recommends: libblockdev-part >= %{libblockdevver} +Recommends: libblockdev-swap >= %{libblockdevver} +Recommends: libblockdev-s390 >= %{libblockdevver} Requires: python2-bytesize >= %{libbytesizever} Requires: util-linux >= %{utillinuxver} Requires: lsof Requires: python2-hawkey Requires: %{realname}-data = %{epoch}:%{version}-%{release} -%if %{is_rhel} -Requires: udev -Requires: pygobject3 -%else Requires: systemd-udev Requires: python2-gobject-base -%endif Obsoletes: blivet-data < 1:2.0.0 Obsoletes: python-blivet < 1:2.0.0 @@ -187,10 +190,42 @@ configuration. %endif %changelog -* Mon Apr 02 2018 David Lehman - 1:3.0.0-0.7.b1 +* Wed May 02 2018 David Lehman - 3.1.0-0.1.b1 +- Add 'nvdimm' tag for NVDIMM namespaces (vtrefny) +- Add test for NVDIMMNamespaceDevicePopulator (vtrefny) +- Add populator helper for NVDIMM namespaces (vtrefny) +- Add 'NVDIMMNamespaceDevice' device representing NVDIMM namespaces (vtrefny) +- Add a function for identifying NVDIMM namespaces (vtrefny) +- Add a singleton for NVDIMM namespaces management (vtrefny) +- Add NVDIMM plugin to list of requested plugins (vtrefny) + +* Fri Apr 20 2018 David Lehman - 3.0.1-1 +- Weak dependencies for libblockdev plugins (japokorn) +- Translate log levels from libblockdev to python log levels (vtrefny) +- Try to wait after stopping an MD array (vtrefny) +- Replace deprecated iscsi_firmware dracut option (rvykydal) +- Fix how we check return value for call_sync in safe_dbus (vtrefny) +- Conditionalize the Python 2 subpackage and don't build it on EL > 7 and + Fedora > 28 (miro) +- Fix python3 conditional in rpm spec file. (dlehman) +- Fix upstream URL in spec (vtrefny) +- Allow device specification by node to udev.get_device. (#1524700) (dlehman) +- Do not try to update potfile during make all (vtrefny) +- Use '-p1' when applying patches with autosetup (vtrefny) +- Remove dependency on pocketlint (vtrefny) +- Dasd is a valid label type on s390x (#1538550) (vponcova) +- fcoe: remove /etc/fcoe dir if it exists before copying configuration + (#1542846) (rvykydal) +- Avoid UnitTest.subTest due to python2 incompatibility. (dlehman) +- Adapt action test mock imports for compatibility w/ python2 & python3. + (dlehman) +- Use explicit super() syntax in config actions for py2 compat. (dlehman) +- Use libblockdev runtime dependency checks (#1501249) (vtrefny) +- Fix minor typos (yurchor) + +* Mon Apr 02 2018 David Lehman - 1:3.0.0-0.6.1.b1 - Use bcond for with python3, allow it on RHEL > 7 (mhroncok) - Conditionalize the Python 2 subpackage and don't build it on EL > 7 and Fedora > 28 (mhroncok) -- Add experimental support for NVDIMM. (vtrefny) * Tue Mar 20 2018 David Lehman - 1:3.0.0-0.6.b1 - Don't use a 'wwn' kwarg for MDBiosRaidArrayDevice (#1557957) (awilliam) diff --git a/sources b/sources index 844460e..002e253 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blivet-3.0.0.b1.tar.gz) = 398c55c7a45505aed538fe7503aabc904f1b7ef6a5b7f347e43dc75c35ab776923de015f8ebcafbd0a50357672928cca59e6a0673aec2a7d263adcd0ed984c74 +SHA512 (blivet-3.1.0.b1.tar.gz) = 8766ada8cf3779047a4c4ad49eb348422e56195cb5135aa0d68c63b54ca76b0010138a457123ac5969b259abe7a6c4b927c1fd317f0f9084b3da4229e19715ee