Hello community,
here is the log from the commit of package libhbalinux2 for openSUSE:Factory
checked in at Mon Jul 19 20:24:54 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-05-08 11:31:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/libhbalinux2/libhbalinux2.changes 2010-07-06 11:51:46.000000000 +0200
@@ -0,0 +1,16 @@
+-------------------------------------------------------------------
+Mon Apr 26 14:05:02 CEST 2010 - hare@suse.de
+
+- Fix issue preventing luns display for luns higher than 1023
+ (bnc#599421)
+
+-------------------------------------------------------------------
+Fri Dec 4 14:56:45 CET 2009 - hare@suse.de
+
+- Correct libraryname in /etc/hba.conf
+- Require libHBAAPI2 for correct operation.
+
+-------------------------------------------------------------------
+Mon Nov 16 10:42:20 CET 2009 - hare@suse.de
+
+- Initial package (FATE#306854)
calling whatdependson for head-i586
New:
----
libhbalinux-fix-issue-preventi
libhbalinux-remove-install-data-hook
libhbalinux-v1.0.8.tar.bz2
libhbalinux2.changes
libhbalinux2.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libhbalinux2.spec ++++++
#
# spec file for package libhbalinux2 (Version 1.0.8)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: libhbalinux2
Version: 1.0.8
Release: 1
Summary: FC-HBAAPI implementation using scsi_transport_fc interfaces
Group: System/Libraries
License: LGPLv2.0+
Url: http://www.open-fcoe.org
Source0: http://www.open-fcoe.org/openfc/libhbalinux-v%{version}.tar.bz2
Patch0: libhbalinux-remove-install-data-hook
Patch1: libhbalinux-fix-issue-preventi
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf libHBAAPI2-devel libpciaccess0-devel
Requires: libHBAAPI2
%description
SNIA HBAAPI vendor library built on top of the scsi_transport_fc
interfaces
Authors:
--------
Christoper Leech
%prep
%setup -q -n libhbalinux-v%{version}
%patch0 -p1
%patch1 -p1
%build
autoreconf --install
%configure --disable-static
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.so' -exec rm -f {} ';'
%post
/sbin/ldconfig
ORG=org.open-fcoe.libhbalinux
LIB=%{_libdir}/libhbalinux.so.2
STR="$ORG $LIB"
CONF=/etc/hba.conf
if test -f $CONF; then
ORIG=$(sed -n "s/^[[:space:]]*$ORG[[:space:]]*\(.*\)/\1/p" $CONF)
if [ "$ORIG" != "$LIB" ] ; then
echo $STR >> $CONF
else
echo "** $CONF already configured"
echo "** system configuration not updated"
fi;
else
echo "** WARNING: $CONF does not exist"
echo "** system configuration not updated"
fi
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc README
%doc COPYING
%{_libdir}/*.so.*
%changelog
++++++ libhbalinux-fix-issue-preventi ++++++
libhbalinux: fix issue preventing luns display for luns higher than 1023
From: Vasu Dev
Removes check blocking lun value higher than 1023 as fcoeadm needs to
display them as well.
Currently lun value is retrieved from their scsi int value representation
in /sysfs and stored in double long after 48 bit left shift, and later
stored value used in comparing against same /sysfs int value after 48 bit
right shift to stored value, this is issue for higher luns value as second
48 bits right shift won't give same value as it was originally from /sysfs
and in turn compare always fails for such cases and in turn their lun info
is never displayed with fcoeadm -l or -t options.
So instead of doing these bits shifts for their only use to compare /sysfs
int value, just store int value as is to keep their value intact for higher
luns value also.
Also maxframe_size is not supported by all HBAs, thus ignore rc
for reading maxframe_size to avoid following error print.
fprintf(stderr, "%s: errors (%x) from /sys reads in %s\n",
__func__, rc, dp->d_name);
Signed-off-by: Vasu Dev
---
bind.c | 9 ++-------
rport.c | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/bind.c b/bind.c
index b6cc103..5590636 100644
--- a/bind.c
+++ b/bind.c
@@ -251,7 +251,7 @@ get_binding_target_mapping(struct dirent *dp, void *ctxt_arg)
fcp->FcId = pp->ap_attr.PortFcId;
fcp->NodeWWN = pp->ap_attr.NodeWWN;
fcp->PortWWN = pp->ap_attr.PortWWN;
- fcp->FcpLun = (HBA_UINT64) lun << 48;
+ fcp->FcpLun = (HBA_UINT64) lun;
}
/*
@@ -364,11 +364,6 @@ get_binding_sg_name(struct port_info *lp, HBA_WWN disc_wwpn,
if (rp == NULL)
return HBA_STATUS_ERROR_ILLEGAL_WWN;
- /*
- * Check for LUN more than 1023 or multi-level.
- */
- if (fc_lun & ((0xfc01ULL << 48) - 1))
- return HBA_STATUS_ERROR;
memset(&ctxt, 0, sizeof(ctxt));
memset(&entry, 0, sizeof(entry));
ctxt.oc_rport = rp;
@@ -377,7 +372,7 @@ get_binding_sg_name(struct port_info *lp, HBA_WWN disc_wwpn,
ctxt.oc_target = rp->ap_scsi_target;
if (ctxt.oc_target == -1)
return ENOENT;
- ctxt.oc_lun = fc_lun >> 48;
+ ctxt.oc_lun = (int) fc_lun;
ctxt.oc_limit = 1;
ctxt.oc_ver = 1;
ctxt.oc_entries = &entry;
diff --git a/rport.c b/rport.c
index 7b72872..1460c2e 100644
--- a/rport.c
+++ b/rport.c
@@ -80,7 +80,7 @@ sysfs_get_rport(struct dirent *dp, void *arg)
rc |= sys_read_wwn(rport_dir, "port_name", &rpa->PortWWN);
rc |= sa_sys_read_u32(rport_dir, "port_id", &rpa->PortFcId);
rc |= sa_sys_read_u32(rport_dir, "scsi_target_id", &rp->ap_scsi_target);
- rc |= sa_sys_read_line(rport_dir, "maxframe_size", buf, sizeof(buf));
+ sa_sys_read_line(rport_dir, "maxframe_size", buf, sizeof(buf));
sscanf(buf, "%d", &rpa->PortMaxFrameSize);
rc |= sys_read_port_state(rport_dir, "port_state", &rpa->PortState);
rc |= sys_read_classes(rport_dir, "supported_classes",
++++++ libhbalinux-remove-install-data-hook ++++++
diff --git a/Makefile.am b/Makefile.am
index b0ab765..47e8864 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,22 +10,3 @@ libhbalinux_la_LIBADD = $(PCIACCESS_LIBS)
dist_noinst_DATA = README COPYING INSTALL libhbalinux.spec
-install-data-hook: libhbalinux.la
- . $<; \
- ORG=org.open-fcoe.libhbalinux; \
- LIB=${libdir}/$${dlname}; \
- STR="$$ORG $$LIB"; \
- CONF=${sysconfdir}/hba.conf; \
- if test -f $$CONF; then \
- grep -E -q ^[[:space:]]*$$ORG[[:space:]]+$$LIB $$CONF; \
- if test $$? -ne 0; then \
- echo $$STR >> $$CONF; \
- else \
- echo "** $$CONF already configured"; \
- echo "** system configuration not updated"; \
- fi; \
- else \
- echo "** WARNING: $$CONF does not exist"; \
- echo "** system configuration not updated"; \
- fi
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
