diff --git a/SOURCES/0001-Remove-enclosure-information-for-FCP-FCoE.patch b/SOURCES/0001-Remove-enclosure-information-for-FCP-FCoE.patch new file mode 100644 index 0000000..efd6ff1 --- /dev/null +++ b/SOURCES/0001-Remove-enclosure-information-for-FCP-FCoE.patch @@ -0,0 +1,32 @@ +From 83e9f168adfde6ae8ad1efcd661fc47d23bc85cc Mon Sep 17 00:00:00 2001 +From: David Sommerseth +Date: Fri, 19 Jun 2015 10:03:57 +0200 +Subject: [PATCH] Remove enclosure information for FCP/FCoE + +After having done a little bit of research, I've not been able to +find any sources for enclosure information in the FC/FCoE protocol. + +So for now, remove the attempts of printing this information +on these protocols. This can be reintroduced later when we know +more how to extract this information. + +Signed-off-by: David Sommerseth +--- + src/lsscsi.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/lsscsi.c b/src/lsscsi.c +index e494169..ee330bf 100644 +--- a/src/lsscsi.c ++++ b/src/lsscsi.c +@@ -2267,7 +2267,6 @@ transport_tport_longer(const char * devname, const struct lsscsi_opts * op) + printf(" port_state=%s\n", value); + if (get_value(buff, "roles", value, sizeof(value))) + printf(" roles=%s\n", value); +- print_enclosure_device(devname, b2, op); + if (get_value(buff, "scsi_target_id", value, sizeof(value))) + printf(" scsi_target_id=%s\n", value); + if (get_value(buff, "supported_classes", value, +-- +1.8.3.1 + diff --git a/SPECS/lsscsi.spec b/SPECS/lsscsi.spec index e87d149..1b17529 100644 --- a/SPECS/lsscsi.spec +++ b/SPECS/lsscsi.spec @@ -1,13 +1,15 @@ Summary: List SCSI devices (or hosts) and associated information Name: lsscsi Version: 0.27 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz URL: http://sg.danny.cz/scsi/lsscsi.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: 0001-Remove-enclosure-information-for-FCP-FCoE.patch + %description Uses information provided by the sysfs pseudo file system in Linux kernel 2.6 series to list SCSI devices or all SCSI hosts. Includes a "classic" @@ -21,7 +23,7 @@ Author: %prep %setup -q - +%patch0 -p1 %build %configure @@ -45,6 +47,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 19 2015 David Sommerseth - 0.27-4 +- Remove enclosure queries for FCP/FCoE (#1062322) + * Fri Jan 24 2014 Daniel Mach - 0.27-3 - Mass rebuild 2014-01-24 @@ -132,7 +137,7 @@ rm -rf %{buildroot} - osst device file names fix * Sat Jan 18 2003 - Doug Gilbert 0.05-1 - output st and osst device file names (rather than "-") -* Thu Jan 14 2003 - Doug Gilbert 0.04-1 +* Tue Jan 14 2003 - Doug Gilbert 0.04-1 - fix multiple listings of st devices (needed for lk 2.5.57) * Thu Jan 09 2003 - Doug Gilbert 0.03-1 - add --generic option (list sg devices), scsi_level output