Accepting request 405915 from home:michel_mno:branches:hardware
- use upstream github.com/ibm-genwqe not github.com/tblume - update from git v4.0.17 to master commit c2f7723 - add ppc64 as target arch - link dynamically to libcxl available for ppc64/ppc64le - new genwqe-user-4.0.17-libcxl.patch OBS-URL: https://build.opensuse.org/request/show/405915 OBS-URL: https://build.opensuse.org/package/show/hardware/genwqe-tools?expand=0&rev=2
This commit is contained in:
OBS User michel_mno
Git OBS Bridge
parent
156e31cc93
commit
487e0662a5
12
_service
12
_service
@ -1,15 +1,19 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/tblume/genwqe-user.git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="url">https://github.com/ibm-genwqe/genwqe-user.git</param>
|
||||
<param name="subdir"></param>
|
||||
<param name="filename">genwqe-user</param>
|
||||
<param name="version">4.0.17</param>
|
||||
<param name="revision">SLES12SP2</param>
|
||||
<param name="versionformat">4.0.17+git%cd.%h</param>
|
||||
<param name="revision">master</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>
|
||||
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 1 14:09:21 UTC 2016 - normand@linux.vnet.ibm.com
|
||||
|
||||
- use upstream github.com/ibm-genwqe not github.com/tblume
|
||||
- update from git v4.0.17 to master commit c2f7723
|
||||
- add ppc64 as target arch
|
||||
- link dynamically to libcxl available for ppc64/ppc64le
|
||||
- new genwqe-user-4.0.17-libcxl.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 22 04:31:09 UTC 2016 - Thomas.Blume@suse.com
|
||||
|
||||
|
||||
@ -21,18 +21,22 @@ Summary: GenWQE userspace tools
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools
|
||||
Name: genwqe-tools
|
||||
Version: 4.0.17
|
||||
Release: 1%{?dist}
|
||||
Version: 4.0.17+git20160628.c2f7723
|
||||
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
|
||||
%ifarch ppc64le ppc64
|
||||
BuildRequires: libcxl-devel
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: s390x ppc64le
|
||||
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
|
||||
Patch0: genwqe-user-4.0.17-libcxl.patch
|
||||
|
||||
%description
|
||||
Provide a suite of utilities to manage and configure the IBM GenWQE card.
|
||||
@ -60,19 +64,21 @@ Requires: %{name} = %{version}
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%package static
|
||||
Summary: Static library files for %{name}
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description static
|
||||
The %{name}-static package contains static libraries for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n genwqe-user-%{version}
|
||||
|
||||
%ifarch ppc64le
|
||||
%define libcxl "BUNDLE_LIBCXL=1"
|
||||
%endif
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%ifarch ppc64le
|
||||
%{__make} -C ext/libcxl CFLAGS="-I../include"
|
||||
%endif
|
||||
|
||||
%{__make} %{?_smp_mflags} tools lib VERSION=%{version} %{?libcxl}
|
||||
%{__make} %{?_smp_mflags} tools lib VERSION=%{version}
|
||||
|
||||
%install
|
||||
%{__make} %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \
|
||||
@ -90,6 +96,7 @@ developing applications that use %{name}.
|
||||
%{__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
|
||||
strip %{buildroot}%{_bindir}/zlib_mt_perf
|
||||
@ -97,7 +104,7 @@ strip %{buildroot}%{_bindir}/zlib_mt_perf
|
||||
ln -sf %{_bindir}/genwqe_gunzip %{buildroot}/%{_libdir}/genwqe/gunzip
|
||||
ln -sf %{_bindir}/genwqe_gzip %{buildroot}/%{_libdir}/genwqe/gzip
|
||||
|
||||
%ifarch ppc64le
|
||||
%ifarch ppc64le ppc64
|
||||
%pre
|
||||
%service_add_pre genwqe_maint.service
|
||||
|
||||
@ -132,23 +139,24 @@ ln -sf %{_bindir}/genwqe_gzip %{buildroot}/%{_libdir}/genwqe/gzip
|
||||
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE
|
||||
%{_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/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*
|
||||
|
||||
%ifarch ppc64le
|
||||
%ifarch ppc64le ppc64
|
||||
%{_bindir}/genwqe_maint
|
||||
%{_bindir}/genwqe_loadtree
|
||||
%{_unitdir}/genwqe_maint.service
|
||||
%{_mandir}/man1/genwqe_maint.1.gz
|
||||
%{_mandir}/man1/genwqe_loadtree.1.gz
|
||||
%{_mandir}/man1/genwqe_maint.1*
|
||||
%{_mandir}/man1/genwqe_loadtree.1*
|
||||
%endif
|
||||
|
||||
%files -n genwqe-zlib
|
||||
@ -160,20 +168,22 @@ ln -sf %{_bindir}/genwqe_gzip %{buildroot}/%{_libdir}/genwqe/gzip
|
||||
|
||||
%files -n genwqe-vpd
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE
|
||||
%{_bindir}/genwqe_csv2vpd
|
||||
%{_bindir}/genwqe_vpdconv
|
||||
%{_bindir}/genwqe_vpdupdate
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE
|
||||
|
||||
%{_sysconfdir}/genwqe_vpd.csv
|
||||
%{_mandir}/man1/genwqe_csv2vpd.1.gz
|
||||
%{_mandir}/man1/genwqe_vpdconv.1.gz
|
||||
%{_mandir}/man1/genwqe_vpdupdate.1.gz
|
||||
%{_mandir}/man1/genwqe_csv2vpd.1*
|
||||
%{_mandir}/man1/genwqe_vpdconv.1*
|
||||
%{_mandir}/man1/genwqe_vpdupdate.1*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_includedir}/genwqe
|
||||
%{_includedir}/genwqe/*
|
||||
|
||||
%files static
|
||||
%{_libdir}/genwqe/*.a
|
||||
|
||||
%changelog
|
||||
|
||||
3
genwqe-user-4.0.17+git20160628.c2f7723.tar.xz
Normal file
3
genwqe-user-4.0.17+git20160628.c2f7723.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3d0913477c65e9a961da7ecb51b8377aaef88f778926e630af97febe93ac6acc
|
||||
size 167628
|
||||
23
genwqe-user-4.0.17-libcxl.patch
Normal file
23
genwqe-user-4.0.17-libcxl.patch
Normal file
@ -0,0 +1,23 @@
|
||||
---
|
||||
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
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b47d3e666048e4f885cc3c34cd49e2f73b7b9596693ef4233e6591894cba5462
|
||||
size 162660
|
||||
Loading…
x
Reference in New Issue
Block a user