pool/genwqe-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 457631 from home:tsaupe

Browse Source 
use correct git tag for version 4.0.18

OBS-URL: https://build.opensuse.org/request/show/457631
OBS-URL: https://build.opensuse.org/package/show/hardware/genwqe-tools?expand=0&rev=9
This commit is contained in:
OBS User michel_mno 2017-02-16 13:08:49 +00:00 committed by Git OBS Bridge
parent 76f6edc107
commit c237fa32c6
8 changed files with 114 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_service
View File

@ -1,19 +1,15 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="url">https://github.com/ibm-genwqe/genwqe-user.git</param>
<param name="url">https://github.com/tblume/genwqe-user.git</param>
<param name="subdir"></param>
<param name="filename">genwqe-user</param>
<param name="versionformat">4.0.17+git%cd.%h</param>
<param name="revision">master</param>
<param name="version">4.0.18</param>
<param name="revision">version-4.0.18</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*genwqe-user-*.tar</param>
<param name="file">*genwqe-user*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled">
<param name="basename">genwqe-user</param>
</service>
</services>

2
genwqe-tools-rpmlintrc
View File

@ -1,3 +1 @@
addFilter(".*macro-in-comment.*")
addFilter("static-library-without-debuginfo /usr/lib/genwqe/libzADC.a")
addFilter("genwqe.* devel-file-in-non-devel-package")

16
genwqe-tools.changes
View File

@ -1,7 +1,19 @@
-------------------------------------------------------------------
Thu Feb 16 06:47:37 UTC 2017 - Thomas.Blume@suse.com
- use correct git tag for version 4.0.18
-------------------------------------------------------------------
Fri Jan 20 13:47:39 UTC 2017 - Thomas.Blume@suse.com
- update to git version 4.0.18
* pick up all the latest fixes and enhancements to provide continued support
for the FPGA based PCIe gzip accelerator adapters on Power (fate#321594)
-------------------------------------------------------------------
Thu Sep 8 11:16:01 UTC 2016 - Thomas.Blume@suse.com
- add s390 architecture (boo#990235)
-- add s390 architecture (boo#990235)
-------------------------------------------------------------------
Fri Jul 15 09:18:25 UTC 2016 - normand@linux.vnet.ibm.com

157
genwqe-tools.spec
View File

@ -15,87 +15,92 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# zlib-devel 1.2.8 is better, but 1.2.7 should work too
#
# The following switch tries to take care that the distros libz.so is been taken:
# CONFIG_ZLIB_PATH=%{_libdir}/libz.so
# No special libz build should be needed anymore, since we added the right
# dependency to the spec file. We want to have a zlib-devel installed.
#
Summary: GenWQE userspace tools
License: Apache-2.0
Group: Development/Tools
Name: genwqe-tools
Version: 4.0.17+git20160714.596962e
Release: 0%{?dist}
Url: https://github.com/ibm-genwqe/genwqe-user/
Requires: zlib >= 1.2.7
BuildRequires: fdupes
BuildRequires: help2man
BuildRequires: zlib-devel >= 1.2.7
Summary: GenWQE userspace tools
Name: genwqe-tools
Version: 4.0.18
Release: 1%{?dist}
License: Apache-2.0
Group: Development/Tools
URL: https://github.com/ibm-genwqe/genwqe-user/
Requires: zlib >= 1.2.7
BuildRequires: zlib-devel >= 1.2.7 help2man
%ifarch ppc64le ppc64
BuildRequires: libcxl-devel
BuildRequires: kernel-devel >= 4.4.21-69
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390x ppc64le ppc64
BuildRequires: fdupes
BuildRoot: %{_tmppath}/%{name}-root
ExclusiveArch: s390x ppc64le ppc64
#Source0: https://github.com/ibm-genwqe/genwqe-user/archive/v%{version}.tar.gz
#for building from local git (fetched from _service)
Source0: genwqe-user-%{version}.tar.xz
Source1: genwqe-tools-rpmlintrc
Patch0: genwqe-user-4.0.17-libcxl.patch
Patch1: genwqe_add_ldconfig_path.patch
%description
Provide a suite of utilities to manage and configure the IBM GenWQE card.
%package -n genwqe-zlib
Summary: GenWQE hardware accelerated libz
Group: System/Libraries
Summary: GenWQE hardware accelerated libz
Group: System Environment/Base
%description -n genwqe-zlib
GenWQE hardware accelerated libz and test-utilities.
%package -n genwqe-vpd
Summary: GenWQE adapter VPD tools
Group: System/Libraries
Summary: GenWQE adapter VPD tools
Group: System Environment/Base
%description -n genwqe-vpd
The genwqe-vpd package contains GenWQE adapter VPD tools.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
Group: Development/Libraries
Requires: %{name} = %{version}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package static
Summary: Static library files for %{name}
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
%description static
The %{name}-static package contains static libraries for
developing applications that use %{name}.
%prep
%setup -q -n genwqe-user-%{version}
%patch0 -p1
%patch1 -p1
%ifarch ppc64le ppc64
%define libcxl "BUNDLE_LIBCXL=1"
%endif
%build
%ifarch ppc64le ppc64
mkdir -p ext/libcxl/include/misc/
cp /usr/include/misc/cxl.h ext/libcxl/include/misc/
%endif
make %{?_smp_mflags} tools lib VERSION=%{version}
%{__make} %{?_smp_mflags} tools lib VERSION=%{version} \
CONFIG_ZLIB_PATH=/%{_lib}/libz.so.1 %{?libcxl}
%install
make %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \
%{__make} %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \
VERSION=%{version} SYSTEMD_UNIT_DIR=%{buildroot}/%{_unitdir} \
LIB_INSTALL_PATH=%{buildroot}/%{_libdir}/genwqe \
INCLUDE_INSTALL_PATH=%{buildroot}/%{_includedir}/genwqe
# FIXME Instead of trying to fixup things in the spec fike, let us consider
# changing the associated install rule, such that the spec file
# can get smaller and simpler.
#
# Move genwqe_vpd.csv to expected location.
mkdir -p %{buildroot}/%{_sysconfdir}/
install -m 0644 tools/genwqe_vpd.csv %{buildroot}/etc/
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/
%{__install} -m 0644 tools/genwqe_vpd.csv %{buildroot}/etc/
%fdupes %{buildroot}%{_bindir}
%fdupes %{buildroot}%{_libdir}
strip %{buildroot}%{_bindir}/genwqe_gzip
strip %{buildroot}%{_bindir}/genwqe_gunzip
ln -sf %{_bindir}/genwqe_gunzip %{buildroot}/%{_libdir}/genwqe/gunzip
ln -sf %{_bindir}/genwqe_gzip %{buildroot}/%{_libdir}/genwqe/gzip
@ -115,6 +120,7 @@ ln -sf %{_bindir}/genwqe_gzip %{buildroot}/%{_libdir}/genwqe/gzip
%endif
%files -n genwqe-tools
%defattr(0755,root,root)
%{_bindir}/genwqe_echo
%{_bindir}/genwqe_ffdc
%{_bindir}/genwqe_cksum
@ -128,52 +134,75 @@ ln -sf %{_bindir}/genwqe_gzip %{buildroot}/%{_libdir}/genwqe/gzip
%{_bindir}/genwqe_test_gz
%{_bindir}/genwqe_mt_perf
%{_bindir}/zlib_mt_perf
%dir %{_libdir}/genwqe
%{_libdir}/genwqe/gunzip
%{_libdir}/genwqe/gzip
%defattr(-,root,root)
%doc LICENSE
%{_mandir}/man1/genwqe_echo.1*
%{_mandir}/man1/genwqe_ffdc.1*
%{_mandir}/man1/genwqe_gunzip.1*
%{_mandir}/man1/genwqe_gzip.1*
%{_mandir}/man1/genwqe_cksum.1*
%{_mandir}/man1/genwqe_memcopy.1*
%{_mandir}/man1/genwqe_peek.1*
%{_mandir}/man1/genwqe_poke.1*
%{_mandir}/man1/genwqe_update.1*
%{_mandir}/man1/zlib_mt_perf.1*
%{_mandir}/man1/gzFile_test.1*
%{_mandir}/man1/genwqe_echo.1.gz
%{_mandir}/man1/genwqe_ffdc.1.gz
%{_mandir}/man1/genwqe_gunzip.1.gz
%{_mandir}/man1/genwqe_gzip.1.gz
%{_mandir}/man1/genwqe_cksum.1.gz
%{_mandir}/man1/genwqe_memcopy.1.gz
%{_mandir}/man1/genwqe_peek.1.gz
%{_mandir}/man1/genwqe_poke.1.gz
%{_mandir}/man1/genwqe_update.1.gz
%{_mandir}/man1/zlib_mt_perf.1.gz
%{_mandir}/man1/gzFile_test.1.gz
%ifarch ppc64le ppc64
%{_bindir}/genwqe_maint
%{_bindir}/genwqe_loadtree
%{_unitdir}/genwqe_maint.service
%{_mandir}/man1/genwqe_maint.1*
%{_mandir}/man1/genwqe_loadtree.1*
%{_mandir}/man1/genwqe_maint.1.gz
%{_mandir}/man1/genwqe_loadtree.1.gz
%endif
%files -n genwqe-zlib
%defattr(-,root,root)
%doc LICENSE
%defattr(0755,root,root)
%dir %{_libdir}/genwqe
%{_libdir}/genwqe/*.so*
%files -n genwqe-vpd
%doc LICENSE
%defattr(-,root,root,-)
%{_bindir}/genwqe_csv2vpd
%{_bindir}/genwqe_vpdconv
%{_bindir}/genwqe_vpdupdate
%defattr(-,root,root)
%doc LICENSE
%{_sysconfdir}/genwqe_vpd.csv
%{_mandir}/man1/genwqe_csv2vpd.1*
%{_mandir}/man1/genwqe_vpdconv.1*
%{_mandir}/man1/genwqe_vpdupdate.1*
%{_mandir}/man1/genwqe_csv2vpd.1.gz
%{_mandir}/man1/genwqe_vpdconv.1.gz
%{_mandir}/man1/genwqe_vpdupdate.1.gz
%files devel
%{_includedir}/genwqe/
%files static
%dir %{_libdir}/genwqe/
%defattr(-,root,root,-)
%dir %{_includedir}/genwqe
%{_includedir}/genwqe/*
%{_libdir}/genwqe/*.a
%changelog
* Thu Jan 05 2017 Frank Haverkamp <haver@linux.vnet.ibm.com> - 4.0.17
- Make Z_STREAM_END detection circumvention configurable
- Improve debug output
- Improve Z_STREAM_END detection and add testcases (most likely not final yet)
* Wed Apr 06 2016 Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> - 4.0.16
- dlopen uses SONAME when opening libz.
- Support CAPI version.
- Bulid fixes.
- Include genwqe_maint daemon (CAPI version).
* Mon Apr 04 2016 Frank Haverkamp <haverkam@de.ibm.com>
- Renamed some scripts again
* Thu Feb 04 2016 Frank Haverkamp <haverkam@de.ibm.com>
- Fix s390 and Intel build. Remove debug stuff from zlib rpm.
* Fri Dec 11 2015 Frank Haverkamp <haverkam@de.ibm.com>
- Changing some install directories again.
* Tue Dec 08 2015 Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> - 4.0.7-1
- Create Fedora package.
- Make genwqe-vpd and genwqe-libz subpackages of genwqe-tools.
* Wed Apr 22 2015 Frank Haverkamp <haverkam@de.ibm.com>
- Initial release.

3
genwqe-user-4.0.17+git20160714.596962e.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7724128ecff58a3bf4a46afb24576be9989e6a646d2aca6bf29dee9b360d0f1
size 167132

23
genwqe-user-4.0.17-libcxl.patch
View File

@ -1,23 +0,0 @@
---
config.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: genwqe-user-4.0.17+git20160628.c2f7723/config.mk
===================================================================
--- genwqe-user-4.0.17+git20160628.c2f7723.orig/config.mk
+++ genwqe-user-4.0.17+git20160628.c2f7723/config.mk
@@ -124,9 +124,13 @@ ifndef DISABLE_LIBCXL
ifeq ($(PLATFORM), ppc64le)
WITH_LIBCXL=1
-BUNDLE_LIBCXL ?= 1
endif
+ifeq ($(PLATFORM), ppc64)
+WITH_LIBCXL=1
+endif
+
+
ifdef BUILD_SIMCODE
WITH_LIBCXL=1
BUNDLE_LIBCXL ?= 1

3
genwqe-user-4.0.18.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac16abed7e2b5300f30b23eb975fd9544f9f6b364109dc9538cde7abd13d77a8
size 178956

17
genwqe_add_ldconfig_path.patch
View File

@ -1,17 +0,0 @@
---
config.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: genwqe-user-4.0.17+git20160628.c2f7723/config.mk
===================================================================
--- genwqe-user-4.0.17+git20160628.c2f7723.orig/config.mk
+++ genwqe-user-4.0.17+git20160628.c2f7723/config.mk
@@ -163,7 +163,7 @@ endif # !DISABLE_LIBCXL
CONFIG_DLOPEN_MECHANISM ?= 1
# CONFIG_ZLIB_PATH ?= /usr/lib64/libz.so.1
-CONFIG_ZLIB_PATH ?= $(shell ldconfig -p | grep libz.so.1 | cut -d' ' -f4 | head -n1)
+CONFIG_ZLIB_PATH ?= $(shell /sbin/ldconfig -p | grep libz.so.1 | cut -d' ' -f4 | head -n1)
ifeq ($(CONFIG_DLOPEN_MECHANISM),1)
CFLAGS += -DCONFIG_DLOPEN_MECHANISM -DCONFIG_ZLIB_PATH=\"$(CONFIG_ZLIB_PATH)\"