diff --git a/.gitignore b/.gitignore index a63f622..f39530d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/opa-ff-10.9.2.2.1.tar.xz +SOURCES/opa-ff-10.10.0.0.445.tar.xz diff --git a/.opa-ff.metadata b/.opa-ff.metadata index 9a85567..2b7000d 100644 --- a/.opa-ff.metadata +++ b/.opa-ff.metadata @@ -1 +1 @@ -9852b1769fa3b697a9e8aaa050971fdfe2cc4360 SOURCES/opa-ff-10.9.2.2.1.tar.xz +006554f29390126ec9bf41686d6a11b761c04f81 SOURCES/opa-ff-10.10.0.0.445.tar.xz diff --git a/SOURCES/update-ff-install-script.patch b/SOURCES/update-ff-install-script.patch index 1793f3b..0e6df54 100644 --- a/SOURCES/update-ff-install-script.patch +++ b/SOURCES/update-ff-install-script.patch @@ -1,16 +1,16 @@ -From a19986431f07165def29ff6a9154b7fe6013edda Mon Sep 17 00:00:00 2001 +From 95795231441a2fcd9b0767f65beb4a59db0b923e Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Tue, 11 Jun 2019 09:18:50 -0400 +Date: Thu, 31 Oct 2019 11:25:14 +0800 Subject: [PATCH] update ff-install script Signed-off-by: Honggang Li --- - OpenIb_Host/ff_filegroups.sh | 20 ++------------------ - OpenIb_Host/ff_install.sh | 11 ----------- - 2 files changed, 2 insertions(+), 29 deletions(-) + OpenIb_Host/ff_filegroups.sh | 16 ++-------------- + OpenIb_Host/ff_install.sh | 7 ------- + 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/OpenIb_Host/ff_filegroups.sh b/OpenIb_Host/ff_filegroups.sh -index 9eb584d..096d1f6 100644 +index e7a0d8f..e457b6e 100644 --- a/OpenIb_Host/ff_filegroups.sh +++ b/OpenIb_Host/ff_filegroups.sh @@ -1,5 +1,5 @@ @@ -29,7 +29,7 @@ index 9eb584d..096d1f6 100644 opaportconfig.1 opaportinfo.1 oparesolvehfiport.1 opasaquery.1 opasmaquery.1" -@@ -91,20 +91,4 @@ opamgt_iba_public_headers="datatypes.h datatypes_osd.h ibyteswap.h ibyteswap_osd +@@ -91,16 +91,4 @@ opamgt_iba_public_headers="datatypes.h datatypes_osd.h ibyteswap.h ibyteswap_osd ilist.h imath.h imemory.h imemory_osd.h ipackoff.h ipackon.h ispinlock.h ispinlock_osd.h statustext.h iethernet.h" @@ -45,13 +45,9 @@ index 9eb584d..096d1f6 100644 - run_batch_script run_batch_cabletest hpl-count.diff groupstress deviation - hpl-config/HPL.dat-* hpl-config/README mpicc mpif77" - --shmem_apps_files="Makefile mpi_hosts.sample prepare_run README select_mpi run_barrier -- run_get_bibw run_get_bw run_get_latency run_put_bibw run_put_bw run_put_latency -- run_reduce run_hello run_alltoall shmem-hello.c" -- - opasnapconfig_bin="opasnapconfig" + opasnapconfig_bin= diff --git a/OpenIb_Host/ff_install.sh b/OpenIb_Host/ff_install.sh -index 97479fe..3da59bb 100755 +index 9430648..3da59bb 100755 --- a/OpenIb_Host/ff_install.sh +++ b/OpenIb_Host/ff_install.sh @@ -29,10 +29,8 @@ mkdir -p ${DESTDIR}/etc/opa @@ -61,7 +57,7 @@ index 97479fe..3da59bb 100755 -mkdir -p ${DESTDIR}/usr/src/opamgt mkdir -p ${DESTDIR}/usr/share/man/man1 mkdir -p ${DESTDIR}/usr/share/man/man8 --mkdir -p ${DESTDIR}/usr/src/opa/{mpi_apps,shmem_apps} +-mkdir -p ${DESTDIR}/usr/src/opa/mpi_apps #Binaries and scripts installing (basic tools) #cd builtbin.OPENIB_FF.release @@ -73,21 +69,17 @@ index 97479fe..3da59bb 100755 OPAMGT_VERNO_MAJOR=$(cat version | cut -d . -f 1) -@@ -92,14 +89,6 @@ cd ../man8 +@@ -92,10 +89,6 @@ cd ../man8 cp -t ${DESTDIR}/usr/share/man/man8 $ff_mans cd .. -cd ../src/mpi/mpi_apps -tar -xzf mpi_apps.tgz -C ${DESTDIR}/usr/src/opa/mpi_apps/ -cd ../../ -- --cd ../src/shmem/shmem_apps --tar -xzf shmem_apps.tgz -C ${DESTDIR}/usr/src/opa/shmem_apps/ --cd ../../ - #Config files cd ../config cp -t ${DESTDIR}/etc/rdma dsap.conf -- -2.20.1 +2.21.0 diff --git a/SPECS/opa-ff.spec b/SPECS/opa-ff.spec index 470bad6..d4d9411 100644 --- a/SPECS/opa-ff.spec +++ b/SPECS/opa-ff.spec @@ -1,6 +1,6 @@ Name: opa-ff Epoch: 1 -Version: 10.9.2.2.1 +Version: 10.10.0.0.445 Release: 1%{?dist} Summary: Intel Omni-Path basic tools and libraries for fabric management License: BSD or GPLv2 @@ -9,7 +9,7 @@ Url: https://github.com/intel/opa-ff # git clone https://github.com/intel/opa-ff.git # cd opa-ff # git archive --format=tar --prefix=opa-ff-%{version}/ \ -# 99a61b0e4189cc0e812bc8737c08aa5933956082 | xz > opa-ff-%{version}.tar.xz +# 9e61462bba6ffbf459848878b7147914629305a7 | xz > opa-ff-%{version}.tar.xz Source: %{name}-%{version}.tar.xz Patch0006: 0001-Add-shebang-for-exp-scripts.patch @@ -56,14 +56,6 @@ Requires: opa-basic-tools%{?_isa} %description -n opa-fastfabric Contains tools for managing fabric on a management node. -%package -n opa-snapconfig -Summary: Configure fabric with snapshot file -AutoReq: no -Requires: opa-fastfabric%{?_isa} - -%description -n opa-snapconfig -Parse information from provided snapshot file and issue packets to program - %package -n opa-libopamgt Summary: Omni-Path management API library Requires: libibumad @@ -200,6 +192,8 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %{_sbindir}/opapaquery %{_sbindir}/opashowmc %{_sbindir}/opa2rm +%{_sbindir}/opaextractperf2 +%{_sbindir}/opamergeperf2 %{_sbindir}/opafmconfigcheck %{_sbindir}/opafmconfigdiff %{_prefix}/lib/opa/tools/opaswquery @@ -357,6 +351,8 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %{_mandir}/man8/opashowmc.8.gz %{_mandir}/man8/opaxmlextract.8.gz %{_mandir}/man8/opaxmlfilter.8.gz +%{_mandir}/man8/opaextractperf2.8.gz +%{_mandir}/man8/opamergeperf2.8.gz %{_mandir}/man8/opaxmlgenerate.8.gz %{_mandir}/man8/opaxmlindent.8.gz %{_mandir}/man8/opaswdisableall.8.gz @@ -397,9 +393,6 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %config(noreplace) %{_sysconfdir}/rdma/op_path_rec.conf %{_sysconfdir}/rdma/opasadb.xml -%files -n opa-snapconfig -%{_prefix}/lib/opa/tools/opasnapconfig - %files -n opa-libopamgt %{_prefix}/lib/libopamgt.* @@ -407,6 +400,10 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %{_includedir}/opamgt %changelog +* Thu Oct 31 2019 Honggang Li - 10.10.0.0.445-1 +- Rebase to latest upstream release v10.10.0.0.445 +- Resolves: bz1719671 + * Wed Jun 12 2019 Honggang Li - 10.9.2.2.1-1 - Rebase to latest upstream release v10.9.2.2.1 - Resolves: bz1660615