From 25cdb631e44f9f7f97f94d84871328022f4d4dee Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 23 Jun 2022 17:32:22 +0000 Subject: [PATCH] import python-rtslib-2.1.75-4.el8 --- .gitignore | 2 +- .python-rtslib.metadata | 2 +- .../0001-Turn-off-unsupported-fabrics.patch | 6 +++-- SOURCES/0002-default_dbroot.patch | 24 +++++++++---------- SPECS/python-rtslib.spec | 17 +++++++++++-- 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index ab54c3e..8f103b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rtslib-fb-2.1.74.tar.gz +SOURCES/rtslib-fb-2.1.75.tar.gz diff --git a/.python-rtslib.metadata b/.python-rtslib.metadata index 2c2654b..4e54677 100644 --- a/.python-rtslib.metadata +++ b/.python-rtslib.metadata @@ -1 +1 @@ -298ec36a694f6f27b84ea16a627e349f5c0792f4 SOURCES/rtslib-fb-2.1.74.tar.gz +358077a7fef2e71230a1b5c87b1765c9292f17f6 SOURCES/rtslib-fb-2.1.75.tar.gz diff --git a/SOURCES/0001-Turn-off-unsupported-fabrics.patch b/SOURCES/0001-Turn-off-unsupported-fabrics.patch index 3ef3e34..2070417 100644 --- a/SOURCES/0001-Turn-off-unsupported-fabrics.patch +++ b/SOURCES/0001-Turn-off-unsupported-fabrics.patch @@ -1,15 +1,17 @@ diff --git a/rtslib/fabric.py b/rtslib/fabric.py -index 02e156c..ff7387f 100644 +index eb8f115..c408661 100644 --- a/rtslib/fabric.py +++ b/rtslib/fabric.py -@@ -464,13 +464,13 @@ fabric_modules = { +@@ -519,14 +519,14 @@ fabric_modules = { "srpt": SRPTFabricModule, "iscsi": ISCSIFabricModule, "loopback": LoopbackFabricModule, - "qla2xxx": Qla2xxxFabricModule, +- "efct": EfctFabricModule, - "sbp": SBPFabricModule, - "tcm_fc": FCoEFabricModule, +# "qla2xxx": Qla2xxxFabricModule, ++# "efct": EfctFabricModule, +# "sbp": SBPFabricModule, +# "tcm_fc": FCoEFabricModule, # "usb_gadget": USBGadgetFabricModule, # very rare, don't show diff --git a/SOURCES/0002-default_dbroot.patch b/SOURCES/0002-default_dbroot.patch index 1317489..35ded5e 100644 --- a/SOURCES/0002-default_dbroot.patch +++ b/SOURCES/0002-default_dbroot.patch @@ -1,22 +1,13 @@ diff --git a/rtslib/root.py b/rtslib/root.py -index 2c5cf43..34bc57d 100644 +index ac40752..8e9724b 100644 --- a/rtslib/root.py +++ b/rtslib/root.py -@@ -166,21 +166,21 @@ class RTSRoot(CFSNode): +@@ -166,19 +166,19 @@ class RTSRoot(CFSNode): self._dbroot = self._default_dbroot return self._dbroot = fread(dbroot_path) - if self._dbroot != self._preferred_dbroot: + if self._dbroot != self._default_dbroot: - if len(FabricModule.list_registered_drivers()) != 0: - # Writing to dbroot_path after drivers have been registered will make the kernel emit this error: - # db_root: cannot be changed: target drivers registered - from warnings import warn - warn("Cannot set dbroot to {}. Target drivers have already been registered." -- .format(self._preferred_dbroot)) -+ .format(self._default_dbroot)) - return - try: - fwrite(dbroot_path, self._preferred_dbroot+"\n") + fwrite(dbroot_path, self._default_dbroot+"\n") @@ -26,6 +17,13 @@ index 2c5cf43..34bc57d 100644 raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists." - .format(self._preferred_dbroot)) + .format(self._default_dbroot)) - self._dbroot = fread(dbroot_path) + else: + # Writing to dbroot_path after devices have been registered will make the kernel emit this error: + # db_root: cannot be changed: target devices registered + from warnings import warn + warn("Cannot set dbroot to {}. Target devices have already been registered." +- .format(self._preferred_dbroot)) ++ .format(self._default_dbroot)) + return - def _get_dbroot(self): + self._dbroot = fread(dbroot_path) diff --git a/SPECS/python-rtslib.spec b/SPECS/python-rtslib.spec index 7f8498f..7d8858a 100644 --- a/SPECS/python-rtslib.spec +++ b/SPECS/python-rtslib.spec @@ -21,8 +21,8 @@ Name: python-rtslib License: ASL 2.0 Group: System Environment/Libraries Summary: API for Linux kernel LIO SCSI target -Version: 2.1.74 -Release: 1%{?dist} +Version: 2.1.75 +Release: 4%{?dist} URL: https://github.com/open-iscsi/%{oname} Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz Source1: target.service @@ -191,6 +191,19 @@ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/ %endif # with python2 %changelog + +* Wed Jun 15 2022 Maurizio Lombardi - 2.1.75-4 +- Updates to the gating tests from mhoyer + +* Wed Jun 15 2022 Maurizio Lombardi - 2.1.75-3 +- Update the gating tests + +* Wed Jun 15 2022 Maurizio Lombardi - 2.1.75-2 +- Fix the gating tests + +* Mon Jun 06 2022 Maurizio Lombardi - 2.1.75-1 +- Update to the latest upstream version + * Mon Oct 26 2020 Maurizio Lombardi - 2.1.74-1 - Update to the latest upstream version