diff --git a/.gitignore b/.gitignore index 65c71cd..3220bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rtslib-fb-2.1.71.tar.gz +SOURCES/rtslib-fb-2.1.73.tar.gz diff --git a/.python-rtslib.metadata b/.python-rtslib.metadata index 50577fd..ab92157 100644 --- a/.python-rtslib.metadata +++ b/.python-rtslib.metadata @@ -1 +1 @@ -9b8cf949711c104d5bf324847c37e386a4ea8ee1 SOURCES/rtslib-fb-2.1.71.tar.gz +e9ed6768e70e1da748972b6e350f620db53a53ec SOURCES/rtslib-fb-2.1.73.tar.gz diff --git a/SOURCES/0001-Turn-off-unsupported-fabrics.patch b/SOURCES/0001-Turn-off-unsupported-fabrics.patch index 45b9088..3ef3e34 100644 --- a/SOURCES/0001-Turn-off-unsupported-fabrics.patch +++ b/SOURCES/0001-Turn-off-unsupported-fabrics.patch @@ -1,15 +1,16 @@ diff --git a/rtslib/fabric.py b/rtslib/fabric.py -index b529f14..8264c37 100644 +index 02e156c..ff7387f 100644 --- a/rtslib/fabric.py +++ b/rtslib/fabric.py -@@ -465,12 +465,12 @@ fabric_modules = { +@@ -464,13 +464,13 @@ fabric_modules = { + "srpt": SRPTFabricModule, "iscsi": ISCSIFabricModule, "loopback": LoopbackFabricModule, - "qla2xxx": Qla2xxxFabricModule, -+# "qla2xxx": Qla2xxxFabricModule, - "sbp": SBPFabricModule, -+# "sbp": SBPFabricModule, - "tcm_fc": FCoEFabricModule, ++# "qla2xxx": Qla2xxxFabricModule, ++# "sbp": SBPFabricModule, +# "tcm_fc": FCoEFabricModule, # "usb_gadget": USBGadgetFabricModule, # very rare, don't show - "vhost": VhostFabricModule, diff --git a/SOURCES/0002-default_dbroot.patch b/SOURCES/0002-default_dbroot.patch index 7d21d38..1317489 100644 --- a/SOURCES/0002-default_dbroot.patch +++ b/SOURCES/0002-default_dbroot.patch @@ -1,13 +1,22 @@ diff --git a/rtslib/root.py b/rtslib/root.py -index b83d7ee..49c4dfc 100644 +index 2c5cf43..34bc57d 100644 --- a/rtslib/root.py +++ b/rtslib/root.py -@@ -166,13 +166,13 @@ class RTSRoot(CFSNode): +@@ -166,21 +166,21 @@ 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") diff --git a/SPECS/python-rtslib.spec b/SPECS/python-rtslib.spec index 210e8ba..2ce2b09 100644 --- a/SPECS/python-rtslib.spec +++ b/SPECS/python-rtslib.spec @@ -21,10 +21,10 @@ Name: python-rtslib License: ASL 2.0 Group: System Environment/Libraries Summary: API for Linux kernel LIO SCSI target -Version: 2.1.71 -Release: 4%{?dist} -URL: https://fedorahosted.org/targetcli-fb/ -Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz +Version: 2.1.73 +Release: 1%{?dist} +URL: https://github.com/open-iscsi/%{oname} +Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz Source1: target.service Patch0: 0001-Turn-off-unsupported-fabrics.patch Patch1: 0002-default_dbroot.patch @@ -191,6 +191,12 @@ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/ %endif # with python2 %changelog +* Thu Jun 25 2020 Maurizio Lombardi - 2.1.73-1 +- Update to new upstream version + +* Mon May 11 2020 Maurizio Lombardi - 2.1.72-1 +- Update to new upstream version + * Thu Dec 12 2019 Maurizio Lombardi - 2.1.71-4 - LIO should use /var/target for its runtime files