diff --git a/correct-name-for-xen-pvscsi.patch b/correct-name-for-xen-pvscsi.patch new file mode 100644 index 0000000..e9352a6 --- /dev/null +++ b/correct-name-for-xen-pvscsi.patch @@ -0,0 +1,39 @@ +From: Olaf Hering +Date: Wed, 17 Jan 2018 12:27:48 +0100 +Subject: Correct name for Xen pvscsi +Git-commit: 5a5670608b7abab061a59d65568e8ab0a53b6ef0 +References: bsc#1076455 + +The name used in released products is xen-pvscsi, not xen_pvscsi. + +Fixes: 2bcc4cd ("Add support for xen-scsiback") + +Signed-off-by: Olaf Hering +Acked-by: Lee Duncan +--- + rtslib/fabric.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rtslib/fabric.py b/rtslib/fabric.py +index 4e9a1ee4073a..b529f14815cc 100644 +--- a/rtslib/fabric.py ++++ b/rtslib/fabric.py +@@ -440,7 +440,7 @@ class VhostFabricModule(_BaseFabricModule): + + class XenPvScsiFabricModule(_BaseFabricModule): + def __init__(self): +- super(XenPvScsiFabricModule, self).__init__('xen_pvscsi') ++ super(XenPvScsiFabricModule, self).__init__('xen-pvscsi') + self._path = "%s/%s" % (self.configfs_dir, 'xen-pvscsi') + self.features = ("nexus", "tpgts") + self.wwn_types = ('naa',) +@@ -469,7 +469,7 @@ fabric_modules = { + "tcm_fc": FCoEFabricModule, + # "usb_gadget": USBGadgetFabricModule, # very rare, don't show + "vhost": VhostFabricModule, +- "xen_pvscsi": XenPvScsiFabricModule, ++ "xen-pvscsi": XenPvScsiFabricModule, + "ibmvscsis": IbmvscsisFabricModule, + } + + diff --git a/python-rtslib-fb.changes b/python-rtslib-fb.changes index 45bd3b6..de03dd5 100644 --- a/python-rtslib-fb.changes +++ b/python-rtslib-fb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 24 18:43:43 UTC 2018 - lduncan@suse.com + +- Fix incorrect naming for XEN (bsc#1076455), adding patch: + * correct-name-for-xen-pvscsi.patch + ------------------------------------------------------------------- Tue Jan 9 14:37:15 UTC 2018 - tchvatal@suse.com diff --git a/python-rtslib-fb.spec b/python-rtslib-fb.spec index 2feffc9..3b019df 100644 --- a/python-rtslib-fb.spec +++ b/python-rtslib-fb.spec @@ -29,6 +29,7 @@ License: Apache-2.0 Group: Development/Languages/Python Url: http://github.com/open-iscsi/rtslib-fb.git Source: %{oname}-%{realver}.tar.xz +Patch1: correct-name-for-xen-pvscsi.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pyudev} BuildRequires: %{python_module setuptools} @@ -49,6 +50,7 @@ the Apache 2.0 license. Contributions are welcome %prep %setup -q -n %{oname}-%{realver} +%patch1 -p1 %build %python_build