- updated to 3.0.3
- Resolves: RHEL-62975
This commit is contained in:
Dan Horák
parent
23d79e54d2
commit
542c8dafd8
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,3 +1,2 @@
|
||||
/lib-zfcp-hbaapi-2.1.tar.gz
|
||||
/lib-zfcp-hbaapi-2.1.1.tar.gz
|
||||
/lib-zfcp-hbaapi-2.2.0.tar.gz
|
||||
/lib-zfcp-hbaapi-*.tar.gz
|
||||
/libzfcphbaapi-*.tar.gz
|
||||
|
||||
@ -23,19 +23,6 @@ index a9a040d..bddc86f 100644
|
||||
bin_PROGRAMS = zfcp_ping zfcp_show
|
||||
|
||||
zfcp_ping_SOURCES = fc_tools/zfcp_ping.c
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index f459693..b9c7712 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -407,6 +407,8 @@ libzfcphbaapi_la_LDFLAGS = \
|
||||
-Wl,-init,_initvlib,-fini,_finivlib \
|
||||
-export-symbols $(SYMFILE)
|
||||
|
||||
+@VENDORLIB_TRUE@libzfcphbaapi_la_LDFLAGS += -module -avoid-version -release $(VERSION)
|
||||
+
|
||||
zfcp_ping_SOURCES = fc_tools/zfcp_ping.c
|
||||
zfcp_show_SOURCES = fc_tools/zfcp_show.c
|
||||
@VENDORLIB_FALSE@zfcp_ping_LDADD = -lzfcphbaapi
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
Declare sysfs_getAdapterAttributes in vlib_sysfs.h, to avoid an
|
||||
implicit function declaration in vlib.c.
|
||||
|
||||
Include <sys/time.h> in fc_tools/zfcp_ping.c for gettimeofday.
|
||||
|
||||
Include <scsi/sg_cmds.h> in vlib_sg.c, to avoid further
|
||||
implicit function declarations.
|
||||
|
||||
diff --git a/fc_tools/zfcp_ping.c b/fc_tools/zfcp_ping.c
|
||||
index 3cf90d8981936c20..0fa34c4702f4cfd2 100644
|
||||
--- a/fc_tools/zfcp_ping.c
|
||||
+++ b/fc_tools/zfcp_ping.c
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <signal.h>
|
||||
#include <hbaapi.h>
|
||||
#include <errno.h>
|
||||
+#include <sys/time.h>
|
||||
#include "include/zfcp_util.h"
|
||||
|
||||
#define FC_PNG_REV 0x00000001
|
||||
diff --git a/vlib_sg.c b/vlib_sg.c
|
||||
index 78f0476378e23b2d..b60ffa6de6aea6db 100644
|
||||
--- a/vlib_sg.c
|
||||
+++ b/vlib_sg.c
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
#include "vlib.h"
|
||||
|
||||
+#include <scsi/sg_cmds.h>
|
||||
+
|
||||
#define INTERVAL 10000000
|
||||
#define RETRIES 1500
|
||||
|
||||
diff --git a/vlib_sysfs.h b/vlib_sysfs.h
|
||||
index 2da344e6d9f5f2ea..c8f9ead4f31c7c27 100644
|
||||
--- a/vlib_sysfs.h
|
||||
+++ b/vlib_sysfs.h
|
||||
@@ -35,6 +35,8 @@ HBA_STATUS sysfs_createAndReadConfigPorts(struct vlib_adapter *);
|
||||
HBA_STATUS sysfs_createAndReadConfigAdapter();
|
||||
HBA_STATUS sysfs_getDiscoveredPortAttributes(HBA_PORTATTRIBUTES **,
|
||||
struct vlib_port *);
|
||||
+HBA_STATUS sysfs_getAdapterAttributes(HBA_ADAPTERATTRIBUTES **,
|
||||
+ struct vlib_adapter *);
|
||||
HBA_STATUS sysfs_getAdapterPortAttributes(HBA_PORTATTRIBUTES **,
|
||||
struct vlib_adapter *);
|
||||
HBA_STATUS sysfs_getPortStatistics(HBA_PORTSTATISTICS **,
|
||||
@ -1,20 +1,16 @@
|
||||
%global srcname lib-zfcp-hbaapi
|
||||
|
||||
Name: libzfcphbaapi
|
||||
Summary: HBA API for the zFCP device driver
|
||||
Version: 2.2.0
|
||||
Release: 25%{?dist}
|
||||
License: CPL-1.0
|
||||
URL: http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
|
||||
# http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%%{hbaapiver}.html
|
||||
Source0: http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/%{srcname}-%{version}.tar.gz
|
||||
Patch1: %{srcname}-2.1.1-fedora.patch
|
||||
Patch2: libzfcphbaapi-c99.patch
|
||||
Version: 3.0.3
|
||||
Release: 1%{?dist}
|
||||
License: EPL-1.0
|
||||
URL: https://github.com/ibm-s390-linux/libzfcphbaapi
|
||||
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch1: %{name}-3.0.2-fedora.patch
|
||||
|
||||
ExclusiveArch: s390 s390x
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: automake
|
||||
BuildRequires: automake autoconf libtool
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: sg3_utils-devel
|
||||
BuildRequires: make
|
||||
@ -42,18 +38,14 @@ Documentation in HTML format for the zFCP HBA API Library.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{srcname}-%{version}
|
||||
|
||||
%patch 1 -p1 -b .fedora
|
||||
%patch 2 -p1
|
||||
%autosetup
|
||||
|
||||
|
||||
%build
|
||||
autoreconf -vif
|
||||
|
||||
%configure --disable-static
|
||||
# manually disable rpath
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
make EXTRA_CFLAGS="-fno-strict-aliasing"
|
||||
%make_build EXTRA_CFLAGS="-fno-strict-aliasing"
|
||||
|
||||
|
||||
%install
|
||||
@ -72,7 +64,8 @@ fi
|
||||
|
||||
|
||||
%files
|
||||
%doc README COPYING ChangeLog AUTHORS LICENSE
|
||||
%license LICENSE
|
||||
%doc README COPYING ChangeLog AUTHORS
|
||||
%{_bindir}/zfcp_ping
|
||||
%{_bindir}/zfcp_show
|
||||
%{_libdir}/%{name}.so.*
|
||||
@ -85,7 +78,6 @@ fi
|
||||
%files devel
|
||||
%{_mandir}/man3/hbaapi.h.3*
|
||||
%{_libdir}/%{name}.so
|
||||
%exclude %{_libdir}/%{name}.la
|
||||
%{_includedir}/hbaapi.h
|
||||
|
||||
%files docs
|
||||
@ -93,6 +85,10 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 09 2025 Dan Horák <dhorak@redhat.com> - 3.0.3-1
|
||||
- updated to 3.0.3
|
||||
- Resolves: RHEL-62975
|
||||
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.2.0-25
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (lib-zfcp-hbaapi-2.2.0.tar.gz) = 8abf7d774a86b75ef3074f194d2a2fc173e336e03dd808c894603e5231e702a815411b8b2a187e08bb6addc2cbbb6441b14609eec5800f6e720778c1379df206
|
||||
SHA512 (libzfcphbaapi-3.0.3.tar.gz) = 3a49ec8f5d8a570bf85ae0c85901037c37822bc44c3f2e9982689aeb1d9a906fe91d17375db6f5de0f36966f7e822d4e8ab8bf724431da42f9388e7a9634c26d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user