From a2567b87ec9956c8d82f058a821dfe9ee77cd418 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 05:36:00 -0400 Subject: [PATCH] import python-rtslib-2.1.71-4.el8 --- .gitignore | 2 +- .python-rtslib.metadata | 2 +- .../0001-Turn-off-unsupported-fabrics.patch | 3 ++- SOURCES/0002-default_dbroot.patch | 22 +++++++++++++++++++ SPECS/python-rtslib.spec | 18 +++++++++++++-- 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 SOURCES/0002-default_dbroot.patch diff --git a/.gitignore b/.gitignore index c26a4c1..65c71cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rtslib-fb-2.1.fb69.tar.gz +SOURCES/rtslib-fb-2.1.71.tar.gz diff --git a/.python-rtslib.metadata b/.python-rtslib.metadata index f5dc9d2..50577fd 100644 --- a/.python-rtslib.metadata +++ b/.python-rtslib.metadata @@ -1 +1 @@ -4148d5c9083d72a952d431809db1adbea93668de SOURCES/rtslib-fb-2.1.fb69.tar.gz +9b8cf949711c104d5bf324847c37e386a4ea8ee1 SOURCES/rtslib-fb-2.1.71.tar.gz diff --git a/SOURCES/0001-Turn-off-unsupported-fabrics.patch b/SOURCES/0001-Turn-off-unsupported-fabrics.patch index e8b48dd..45b9088 100644 --- a/SOURCES/0001-Turn-off-unsupported-fabrics.patch +++ b/SOURCES/0001-Turn-off-unsupported-fabrics.patch @@ -5,7 +5,8 @@ index b529f14..8264c37 100644 @@ -465,12 +465,12 @@ fabric_modules = { "iscsi": ISCSIFabricModule, "loopback": LoopbackFabricModule, - "qla2xxx": Qla2xxxFabricModule, +- "qla2xxx": Qla2xxxFabricModule, ++# "qla2xxx": Qla2xxxFabricModule, - "sbp": SBPFabricModule, +# "sbp": SBPFabricModule, - "tcm_fc": FCoEFabricModule, diff --git a/SOURCES/0002-default_dbroot.patch b/SOURCES/0002-default_dbroot.patch new file mode 100644 index 0000000..7d21d38 --- /dev/null +++ b/SOURCES/0002-default_dbroot.patch @@ -0,0 +1,22 @@ +diff --git a/rtslib/root.py b/rtslib/root.py +index b83d7ee..49c4dfc 100644 +--- a/rtslib/root.py ++++ b/rtslib/root.py +@@ -166,13 +166,13 @@ 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: + try: +- fwrite(dbroot_path, self._preferred_dbroot+"\n") ++ fwrite(dbroot_path, self._default_dbroot+"\n") + except: +- if not os.path.isdir(self._preferred_dbroot): ++ if not os.path.isdir(self._default_dbroot): + 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) + + def _get_dbroot(self): diff --git a/SPECS/python-rtslib.spec b/SPECS/python-rtslib.spec index 7ef6496..210e8ba 100644 --- a/SPECS/python-rtslib.spec +++ b/SPECS/python-rtslib.spec @@ -21,12 +21,13 @@ Name: python-rtslib License: ASL 2.0 Group: System Environment/Libraries Summary: API for Linux kernel LIO SCSI target -Version: 2.1.fb69 -Release: 3%{?dist} +Version: 2.1.71 +Release: 4%{?dist} URL: https://fedorahosted.org/targetcli-fb/ Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz Source1: target.service Patch0: 0001-Turn-off-unsupported-fabrics.patch +Patch1: 0002-default_dbroot.patch BuildArch: noarch BuildRequires: systemd-units Requires(post): systemd @@ -100,6 +101,7 @@ on system restart. %prep %setup -q -n %{oname}-%{version} %patch0 -p1 +%patch1 -p1 %if %{with python3} rm -rf %{py3dir} @@ -189,6 +191,18 @@ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/ %endif # with python2 %changelog +* Thu Dec 12 2019 Maurizio Lombardi - 2.1.71-4 +- LIO should use /var/target for its runtime files + +* Thu Nov 28 2019 Maurizio Lombardi - 2.1.71-2 +- Remove support to qla2xxx + +* Tue Nov 19 2019 Maurizio Lombardi - 2.1.71-1 +- Update to new upstream version + +* Wed May 15 2019 Maurizio Lombardi - 2.1.fb69-4 +- report the correct size for partitions + * Thu Jan 17 2019 Maurizio Lombardi - 2.1.fb69-3 - Disable the FCoE fabric module