From b85b2f24ed4f55c1e6414cd4c23aeb3aee35cdd5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:47:50 +0000 Subject: import opa-fm-10.5.1.0.1-1.el7 --- diff --git a/.gitignore b/.gitignore index 63bf017..1f52e86 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/opa-fm-10.3.1.0-6.tar.xz +SOURCES/opa-fm-10.5.1.0.1.tar.xz diff --git a/.opa-fm.metadata b/.opa-fm.metadata index 08bdefa..ad1f739 100644 --- a/.opa-fm.metadata +++ b/.opa-fm.metadata @@ -1 +1 @@ -21c2bdd130be9a52f1e8fed22e96956cf025a951 SOURCES/opa-fm-10.3.1.0-6.tar.xz +878bfcce54299378911138bdf6e42b03364cf43b SOURCES/opa-fm-10.5.1.0.1.tar.xz diff --git a/SOURCES/0001-Fix-well-known-tempfile-issue-in-script.patch b/SOURCES/0001-Fix-well-known-tempfile-issue-in-script.patch index d7eb2af..84da4d2 100644 --- a/SOURCES/0001-Fix-well-known-tempfile-issue-in-script.patch +++ b/SOURCES/0001-Fix-well-known-tempfile-issue-in-script.patch @@ -1,18 +1,18 @@ -From 5c42875b9e217127bc6fb537e258f386aed2a23a Mon Sep 17 00:00:00 2001 -From: Brendan Cunningham -Date: Thu, 24 Sep 2015 11:10:45 -0400 -Subject: [PATCH 1/2] Fix well-known tempfile issue in script. +From 5dfa99291d5702abf1a00aa7c396295e019ca5f2 Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Thu, 19 Oct 2017 14:47:19 +0800 +Subject: [PATCH] Fix well-known tempfile issue in script --- Esm/ib/src/linux/startup/sm_capture.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Esm/ib/src/linux/startup/sm_capture.sh b/Esm/ib/src/linux/startup/sm_capture.sh -index cf1e133..e3fbf4b 100755 +index fda2e1f..a284486 100755 --- a/Esm/ib/src/linux/startup/sm_capture.sh +++ b/Esm/ib/src/linux/startup/sm_capture.sh -@@ -46,8 +46,10 @@ fi - +@@ -38,8 +38,10 @@ SM_EXEC=/usr/lib/opa-fm/runtime/sm + IFS_FM_BASE=/usr/lib/opa-fm PROGNAME="$0" -dirName="smdump-"`date '+%d%b%y%H%M%S'` @@ -25,5 +25,5 @@ index cf1e133..e3fbf4b 100755 usage() { echo "Usage:" -- -1.8.3.1 +2.14.0 diff --git a/SPECS/opa-fm.spec b/SPECS/opa-fm.spec index c3aab71..6acb3d8 100644 --- a/SPECS/opa-fm.spec +++ b/SPECS/opa-fm.spec @@ -1,9 +1,7 @@ -%global Intel_Release 6 - Name: opa-fm Epoch: 1 -Version: 10.3.1.0 -Release: 8%{?dist} +Version: 10.5.1.0.1 +Release: 1%{?dist} Summary: Intel Omni-Path Fabric Management Software Group: System Environment/Daemons @@ -12,17 +10,14 @@ Url: https://github.com/01org/opa-fm # tarball created by: # git clone https://github.com/01org/opa-fm.git # cd opa-fm -# git checkout v10_3_1 -# git archive --format=tar --prefix=opa-fm-%{version}-%{Intel_Release}/ \ -# 4a98a653d528f1db788e59d7a25711630561a19c | xz > opa-fm-%{version}-%{Intel_Release}.tar.xz -Source0: %{name}-%{version}-%{Intel_Release}.tar.xz +# git archive --format=tar --prefix=opa-fm-%{version}/ \ +# b5eaf8d7a4170fcd25dcf939ac7fca7cfcab3e41 | xz > opa-fm-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz # bz1262327 needs Patch0002 Patch0002: 0001-Fix-well-known-tempfile-issue-in-script.patch -BuildRequires: autoconf -BuildRequires: systemd -BuildRequires: zlib-devel, openssl-devel, expat-devel +BuildRequires: openssl-devel, expat-devel BuildRequires: libibmad-devel, libibverbs-devel >= 1.2.0 BuildRequires: libibumad-devel Requires(post): systemd @@ -37,7 +32,7 @@ includes: the Subnet Manager, Baseboard Manager, Performance Manager, Fabric Executive, and some fabric management tools. %prep -%setup -q -n %{name}-%{version}-%{Intel_Release} +%setup -q %patch0002 -p1 # Make it possible to override hardcoded compiler flags @@ -68,19 +63,21 @@ mkdir -p %{buildroot}/%{_localstatedir}/usr/lib/opa-fm/ %files %doc Esm/README %{_unitdir}/opafm.service -%config(noreplace) %{_sysconfdir}/sysconfig/opafm.xml -%{_sysconfdir}/sysconfig/opa/opafm.info +%config(noreplace) %{_sysconfdir}/opa-fm/opafm.xml %{_prefix}/lib/opa-fm/bin/* -%{_prefix}/lib/opa-fm/etc/* %{_prefix}/lib/opa-fm/runtime/* -%{_prefix}/lib/opa-fm/samples/* +%{_prefix}/share/opa-fm/* +%{_prefix}/lib/opa/.comp_opafm.pl %{_sbindir}/opafmcmd %{_sbindir}/opafmcmdall -%{_localstatedir}/usr/lib/opa-fm/ %{_mandir}/man8/* %changelog +* Thu Oct 19 2017 Honggang Li - 10.5.1.0.1-1 +- Rebase to upstream release 10.5.1.0.1 +- Resolves: bz1452787, bz1500903 + * Fri Mar 17 2017 Honggang Li - 10.3.1.0-8 - Rebase to upstream branch v10_3_1 as required. - Clean up change log.