diff --git a/.gitignore b/.gitignore index 91bbb62..b579e37 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/opa-fm.tar.xz +SOURCES/opa-fm-10.1.0.0-145.tar.xz diff --git a/.opa-fm.metadata b/.opa-fm.metadata index d60453a..677510a 100644 --- a/.opa-fm.metadata +++ b/.opa-fm.metadata @@ -1 +1 @@ -591548254b59f217b9c771cbeb366fe243dc5d6e SOURCES/opa-fm.tar.xz +9b41a797073bbfee54a434b5b584d5501c8b2906 SOURCES/opa-fm-10.1.0.0-145.tar.xz diff --git a/SOURCES/0001-opafmd-larger-array-to-hold-program-path.patch b/SOURCES/0001-opafmd-larger-array-to-hold-program-path.patch index d0fda32..e718950 100644 --- a/SOURCES/0001-opafmd-larger-array-to-hold-program-path.patch +++ b/SOURCES/0001-opafmd-larger-array-to-hold-program-path.patch @@ -1,27 +1,29 @@ -From acf86501b6f5ad3f04a2dca56a6b13b7925d875d Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Wed, 26 Aug 2015 16:20:07 +0200 +From b549383fab7131c4a8a4a3b3f268ab42b06d577a Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Sun, 10 Jul 2016 23:39:38 -0400 Subject: [PATCH] opafmd: larger array to hold program path Since we're substituting /opt -> /usr/lib, char[25] is no longer sufficient to hold the complete path. + +Signed-off-by: Honggang Li --- Esm/ib/src/linux/startup/opafmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Esm/ib/src/linux/startup/opafmd.c b/Esm/ib/src/linux/startup/opafmd.c -index a31ee001be..50a3f3fae1 100644 +index 190de4a..945560b 100644 --- a/Esm/ib/src/linux/startup/opafmd.c +++ b/Esm/ib/src/linux/startup/opafmd.c -@@ -255,7 +255,7 @@ int parseInput(char *buf){ +@@ -424,7 +424,7 @@ int parseInput(char *buf){ */ int spawn(const unsigned int instance, const int component, int *pids){ int pid; - char prog[25], name[6]; + char prog[50], name[6]; - if(instance >= 4){ + if (instance >= 4){ fprintf(stderr, "Invalid instance number.\n"); return -1; -- -2.4.3 +2.7.4 diff --git a/SOURCES/0002-Revert-Add-script-for-building-S-RPMs.patch b/SOURCES/0002-Revert-Add-script-for-building-S-RPMs.patch deleted file mode 100644 index ffc7758..0000000 --- a/SOURCES/0002-Revert-Add-script-for-building-S-RPMs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d12979a8ed6e508a9c33972561a80c3af9cb6ae8 Mon Sep 17 00:00:00 2001 -From: Brendan Cunningham -Date: Thu, 24 Sep 2015 15:34:41 -0400 -Subject: [PATCH 2/2] Revert "Add script for building (S)RPMs" - -This reverts commit 3117bba5cf249fd9e721d7273b645fa7f49ca076. ---- - build_rpms.bash | 4 ---- - 1 file changed, 4 deletions(-) - delete mode 100755 build_rpms.bash - -diff --git a/build_rpms.bash b/build_rpms.bash -deleted file mode 100755 -index 1bfc2bf..0000000 ---- a/build_rpms.bash -+++ /dev/null -@@ -1,4 +0,0 @@ --#!/bin/bash --mkdir -p $HOME/rpmbuild/{SOURCES,RPMS,SRPMS} --tar czf $HOME/rpmbuild/SOURCES/opa-fm.tar.gz --exclude-vcs . --rpmbuild -ba ./opafm.spec --- -1.8.3.1 - diff --git a/SPECS/opa-fm.spec b/SPECS/opa-fm.spec index c9e2d52..ca9a97f 100644 --- a/SPECS/opa-fm.spec +++ b/SPECS/opa-fm.spec @@ -1,6 +1,8 @@ +%global Intel_Release 145 + Name: opa-fm -Version: 10.0.0.0 -Release: 444%{?dist} +Version: 10.1.0.0 +Release: %{Intel_Release}%{?dist} Summary: Intel Omni-Path Fabric Management Software Group: System Environment/Daemons @@ -9,22 +11,22 @@ Url: https://github.com/01org/opa-fm # tarball created by: # git clone https://github.com/01org/opa-fm.git # cd opa-fm -# git archive --format=tar --prefix=opa-fm/ 5f4087aabb5d03c42738b320af0fc60e9df4d1f7 | xz > opa-fm.tar.xz -Source0: %{name}.tar.xz +# git archive --format=tar --prefix=opa-fm-%{version}-%{Intel_Release}/ \ +# 78e4916cc1928689d74f5da9c3047c6cafe24218 | xz > opa-fm-%{version}-%{Intel_Release}.tar.xz +Source0: %{name}-%{version}-%{Intel_Release}.tar.xz Patch0001: 0001-opafmd-larger-array-to-hold-program-path.patch -# bz1262327 needs Patch0002 and Patch0003 +# bz1262327 needs Patch0002 Patch0002: 0001-Fix-well-known-tempfile-issue-in-script.patch -Patch0003: 0002-Revert-Add-script-for-building-S-RPMs.patch -#BuildRequires: libibverbs-devel >= 1.1-1, libibumad-devel, libibmad-devel BuildRequires: autoconf BuildRequires: systemd BuildRequires: zlib-devel, openssl-devel, expat-devel -BuildRequires: libibmad-devel, libibverbs-devel +BuildRequires: libibmad-devel, libibverbs-devel >= 1.2.0 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Requires: libhfi1 ExclusiveArch: x86_64 %description @@ -33,10 +35,9 @@ includes: the Subnet Manager, Baseboard Manager, Performance Manager, Fabric Executive, and some fabric management tools. %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{version}-%{Intel_Release} %patch0001 -p1 %patch0002 -p1 -%patch0003 -p1 # Make it possible to override hardcoded compiler flags sed -i -r -e 's/(release_C(C)?OPT_Flags\s*)=/\1?=/' Makerules/Target.LINUX.GNU.* @@ -58,8 +59,10 @@ cd Esm ./fmbuild -V %{version}.%{release} %install -install -D -m 755 stage.rpm/opafm.service %{buildroot}/%{_unitdir}/opafm.service -install -D -m 755 stage.rpm/opafmctrl.sh %{buildroot}/usr/lib/opa-fm/bin/opafmctrl.sh +%global fm_mans opafmcmd.8 opafmcmdall.8 + +install -D -m 644 stage.rpm/opafm.service %{buildroot}/%{_unitdir}/opafm.service +install -D -m 755 stage.rpm/opafmctrl %{buildroot}/usr/lib/opa-fm/bin/opafmctrl install -D -m 755 stage.rpm/opafmd %{buildroot}/usr/lib/opa-fm/bin/opafmd install -D -m 644 stage.rpm/opafm.xml %{buildroot}%{_sysconfdir}/sysconfig/opafm.xml @@ -87,8 +90,13 @@ install -D stage.rpm/opaxmlextract %{buildroot}/usr/lib/opa-fm/etc/opaxmlextract install -D stage.rpm/opaxmlfilter %{buildroot}/usr/lib/opa-fm/etc/opaxmlfilter mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_mandir}/man8 ln -s /usr/lib/opa-fm/bin/fm_cmd %{buildroot}%{_sbindir}/opafmcmd ln -s /usr/lib/opa-fm/bin/fm_cmdall %{buildroot}%{_sbindir}/opafmcmdall +mkdir -p %{buildroot}/%{_localstatedir}/usr/lib/opa-fm/ + +cd stage.rpm +cp -t %{buildroot}%{_mandir}/man8 %fm_mans %post %systemd_post opafm.service @@ -109,9 +117,28 @@ ln -s /usr/lib/opa-fm/bin/fm_cmdall %{buildroot}%{_sbindir}/opafmcmdall %{_prefix}/lib/opa-fm/runtime/* %{_sbindir}/opafmcmd %{_sbindir}/opafmcmdall +%{_localstatedir}/usr/lib/opa-fm/ +%{_mandir}/man8/* %changelog +* Sun Jul 10 2016 Honggang Li - 10.1.0.0-145 +- Rebase to latest upstream release. +- Related: bz1273151 + +* Tue Jun 21 2016 Honggang Li - 10.0.1.0-4 +- Create private state dir. +- Resolves: bz1348477 + +* Thu Jun 2 2016 Honggang Li - 10.0.1.0-3 +- Requires libhfi1. +- Remove executable permission bit of opafm.service. +- Resolves: bz1341971 + +* Thu May 26 2016 Honggang Li - 10.0.1.0-2 +- Rebase to upstream release 10.0.1.0. +- Related: bz1273151 + * Mon Sep 28 2015 Honggang Li - 10.0.0.0-444 - Update the N-V-R - Related: bz1262327