diff --git a/_service b/_service index 14411a6..303337b 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ @PARENT_TAG@.@TAG_OFFSET@.%h v(.*) \1 - c6b993a4c724f7f3dd3f62a8a5371b0d170b7334 + cb934204ad37b50158e4b89a9f789a1b5637b857 opa-ff*.tar diff --git a/opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz b/opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz deleted file mode 100644 index 78b12e2..0000000 --- a/opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:713a70eced62fcf51854d4c8b11a8ef08ee97c0f9553ff5cb593f2f92f0044d4 -size 6339435 diff --git a/opa-ff-10.8.0.0.201.0.cb934204ad37.tar.gz b/opa-ff-10.8.0.0.201.0.cb934204ad37.tar.gz new file mode 100644 index 0000000..c3e72c3 --- /dev/null +++ b/opa-ff-10.8.0.0.201.0.cb934204ad37.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a00bd9eb490a5e9563a3f327175ad723a6274d682aeb0f2ee7595a43352e8360 +size 6554692 diff --git a/opa-ff-add-shebang-for-exp-files.patch b/opa-ff-add-shebang-for-exp-files.patch index 5f22806..d7a3b41 100644 --- a/opa-ff-add-shebang-for-exp-files.patch +++ b/opa-ff-add-shebang-for-exp-files.patch @@ -1,4 +1,4 @@ -commit 17094ed86eae4ff9c7d4a2846f6d1006e039a571 +commit cc0fea0cb6819eff9c33697fffd129d9ca63bd7e Author: Nicolas Morey-Chaisemartin Date: Thu Jun 8 11:13:38 2017 +0200 @@ -295,7 +295,7 @@ index 8e1a8e6e816d..2081a2b64d1e 100644 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/extmng.exp TestTools/extmng.exp -index 92afc6a4d80a..bb49db846e14 100755 +index b513c61c1069..e0ba680daed3 100755 --- TestTools/extmng.exp +++ TestTools/extmng.exp @@ -1,3 +1,4 @@ @@ -331,7 +331,7 @@ index 773676547a28..8b84886318c8 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/mpi.exp TestTools/mpi.exp -index 25defc08804d..0008685fbe45 100755 +index 4fe36e9aeca0..fa0624080c98 100755 --- TestTools/mpi.exp +++ TestTools/mpi.exp @@ -1,3 +1,4 @@ diff --git a/opa-ff-suse-build-fixes.patch b/opa-ff-suse-build-fixes.patch index 29e5912..d9b3538 100644 --- a/opa-ff-suse-build-fixes.patch +++ b/opa-ff-suse-build-fixes.patch @@ -1,4 +1,4 @@ -commit eea4f1409968d74e218f5d9390141516830d0283 +commit 7ff18bb03325761f33ebebe6ebcef3c4acfd977b Author: Nicolas Morey-Chaisemartin Date: Thu Jun 8 11:11:01 2017 +0200 @@ -34,7 +34,7 @@ index a373262676b5..3a6687d563cc 100755 # Include directories for kernel KERNELDIR=/lib/modules/$(BUILD_TARGET_OS_VERSION)/build diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh -index 5a97ff855962..ce4179db7339 100755 +index e2ef82a12276..8c0be6244776 100755 --- OpenIb_Host/ff_build.sh +++ OpenIb_Host/ff_build.sh @@ -57,7 +57,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF} @@ -50,9 +50,9 @@ index 5a97ff855962..ce4179db7339 100755 +export BUILD_TARGET_OS_VENDOR_VERSION=$BUILD_PLATFORM_OS_VENDOR_VERSION + setver $BUILD_TARGET_OS_VENDOR $BUILD_TARGET_OS_VERSION + export OPA_FEATURE_SET=opa10 - MODULEVERSION=`$TL_DIR/MakeTools/convert_releasetag.pl $RELEASE_TAG` -@@ -69,6 +75,7 @@ shift +@@ -70,6 +76,7 @@ shift set -x { echo "Environment:" diff --git a/opa-ff.changes b/opa-ff.changes index 8e6cfaf..4b02166 100644 --- a/opa-ff.changes +++ b/opa-ff.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 15 07:24:55 UTC 2018 - nmoreychaisemartin@suse.com + +- Update to v10.8.0.0.201 (fate#325855) + * No changelog available. +* Rebase opa-ff-suse-build-fixes.patch and opa-ff-add-shebang-for-exp-files.patch + to the latest sources + ------------------------------------------------------------------- Wed Aug 1 04:29:23 UTC 2018 - bwiedemann@suse.com diff --git a/opa-ff.spec b/opa-ff.spec index 8e7098e..796d55c 100644 --- a/opa-ff.spec +++ b/opa-ff.spec @@ -16,7 +16,7 @@ # -%define git_ver .0.133.0.c6b993a4c724 +%define git_ver .0.201.0.cb934204ad37 %define opamgt_major 0 %define opasadb_major 1_0_0 @@ -24,12 +24,12 @@ %define opasysconfdir %{_sysconfdir}/opa/ Name: opa-ff -Version: 10.7.0 +Version: 10.8.0 Release: 0 Summary: Intel Omni-Path basic tools and libraries for fabric managment License: BSD-3-Clause OR GPL-2.0-only Group: Productivity/Networking/System -Url: http://www.intel.com/ +Url: https://github.com/intel/opa-ff Source0: %{name}-%{version}%{git_ver}.tar.gz Source1: opa-ff.rpmlintrc Patch1: opa-ff-add-shebang-for-exp-files.patch @@ -115,6 +115,14 @@ Requires: libopamgt%{opamgt_major} %description -n libopamgt-devel This package contains the necessary headers for opamgt development. +%package -n opa-snapconfig +Summary: Configure fabric with snapshot file +Group: System/Libraries +Requires: opa-ff + +%description -n opa-snapconfig +Parse information from provided snapshot file and issue packets to program + %prep %setup -q -n %{name}-%{version}%{git_ver} %patch1 @@ -171,6 +179,7 @@ cp -t %{buildroot}%{pseudo_opt}/samples/opamgt $opamgt_examples cd ../bin cp -t %{buildroot}/%{pseudo_opt}/tools/ ${ff_tools_opt} +cp -t %{buildroot}/%{pseudo_opt}/tools/ ${opasnapconfig_bin} cd ../fastfabric cp -t %{buildroot}%{_sbindir} ${ff_tools_sbin} @@ -298,6 +307,13 @@ done ) > %{_builddir}/ff_file.list +# List for snapconfig +( + for file in ${opasnapconfig_bin}; do + echo "%{pseudo_opt}tools/${file}" + done +) > %{_builddir}/snapconfig_file.list + %post -n libopasadb%{opasadb_major} -p /sbin/ldconfig %postun -n libopasadb%{opasadb_major} -p /sbin/ldconfig @@ -370,4 +386,11 @@ done %{_includedir}/opamgt %{pseudo_opt}/samples/opamgt +%files -n opa-snapconfig -f %{_builddir}/snapconfig_file.list +%defattr(-,root,root,-) +%dir %{pseudo_opt} +%dir %{pseudo_opt}tools/ + +%doc README LICENSE + %changelog