From 28ff6ec1e18cd559570f107c4484eca0838dc32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 28 Dec 2023 01:00:40 +0100 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 eth-ff revision a4ef7bd93183372a7a703a2c7bf1b606 --- .gitattributes | 23 ++ _service | 18 ++ eth-ff-11.5.1.0.0.7188a97b9a39.tar.gz | 3 + eth-ff-add-shebang-for-exp-files.patch | 418 +++++++++++++++++++++++++ eth-ff-suse-build-fixes.patch | 75 +++++ eth-ff.changes | 101 ++++++ eth-ff.rpmlintrc | 2 + eth-ff.spec | 233 ++++++++++++++ 8 files changed, 873 insertions(+) create mode 100644 .gitattributes create mode 100644 _service create mode 100644 eth-ff-11.5.1.0.0.7188a97b9a39.tar.gz create mode 100644 eth-ff-add-shebang-for-exp-files.patch create mode 100644 eth-ff-suse-build-fixes.patch create mode 100644 eth-ff.changes create mode 100644 eth-ff.rpmlintrc create mode 100644 eth-ff.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fecc750 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/_service b/_service new file mode 100644 index 0000000..d6ff9c8 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + git + https://github.com/intel/eth-fast-fabric.git + no + .git + eth-ff + @PARENT_TAG@.@TAG_OFFSET@.%h + v(.*) + \1 + 7188a97b9a397defdab503a02de0f6f3a9806947 + + + eth-ff*.tar + gz + + + diff --git a/eth-ff-11.5.1.0.0.7188a97b9a39.tar.gz b/eth-ff-11.5.1.0.0.7188a97b9a39.tar.gz new file mode 100644 index 0000000..7c6cb5b --- /dev/null +++ b/eth-ff-11.5.1.0.0.7188a97b9a39.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0727081f6b4096b354bd3b2cf11165a912d08a4ef28214186ca7bff14fa2dbf5 +size 1980483 diff --git a/eth-ff-add-shebang-for-exp-files.patch b/eth-ff-add-shebang-for-exp-files.patch new file mode 100644 index 0000000..0e04d6f --- /dev/null +++ b/eth-ff-add-shebang-for-exp-files.patch @@ -0,0 +1,418 @@ +commit d6e19d4928d3542fb12d2634ebe47635abf35236 +Author: Nicolas Morey-Chaisemartin +Date: Thu Sep 30 11:18:45 2021 +0200 + + eth-ff add shebang for exp files + + Signed-off-by: Nicolas Morey-Chaisemartin + +diff --git IbaTools/FastFabric/chassis_configure.exp IbaTools/FastFabric/chassis_configure.exp +index faa0d761286c..aba74e8192a2 100644 +--- IbaTools/FastFabric/chassis_configure.exp ++++ IbaTools/FastFabric/chassis_configure.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git IbaTools/FastFabric/chassis_fmconfig.exp IbaTools/FastFabric/chassis_fmconfig.exp +index 815d41a9b36b..c140fa7e8b3b 100644 +--- IbaTools/FastFabric/chassis_fmconfig.exp ++++ IbaTools/FastFabric/chassis_fmconfig.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/chassis_fmcontrol.exp IbaTools/FastFabric/chassis_fmcontrol.exp +index eabe57e0a9f4..08b79ee55267 100644 +--- IbaTools/FastFabric/chassis_fmcontrol.exp ++++ IbaTools/FastFabric/chassis_fmcontrol.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/chassis_fmgetconfig.exp IbaTools/FastFabric/chassis_fmgetconfig.exp +index 4b4865770e09..13790ad70f29 100644 +--- IbaTools/FastFabric/chassis_fmgetconfig.exp ++++ IbaTools/FastFabric/chassis_fmgetconfig.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +index 68ca34e8697e..919baf381e76 100644 +--- IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp ++++ IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/chassis_fmsecurityfiles.exp IbaTools/FastFabric/chassis_fmsecurityfiles.exp +index 6a9d74ae86f5..9a7e9c83d346 100644 +--- IbaTools/FastFabric/chassis_fmsecurityfiles.exp ++++ IbaTools/FastFabric/chassis_fmsecurityfiles.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/chassis_getconfig.exp IbaTools/FastFabric/chassis_getconfig.exp +index 6f8ecab03a05..f9291c8e0c4d 100644 +--- IbaTools/FastFabric/chassis_getconfig.exp ++++ IbaTools/FastFabric/chassis_getconfig.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git IbaTools/FastFabric/chassis_reboot.exp IbaTools/FastFabric/chassis_reboot.exp +index 3e97ec025a70..001b57c5b800 100644 +--- IbaTools/FastFabric/chassis_reboot.exp ++++ IbaTools/FastFabric/chassis_reboot.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/chassis_upgrade.exp IbaTools/FastFabric/chassis_upgrade.exp +index 435d85403dd8..b01ca8207c81 100644 +--- IbaTools/FastFabric/chassis_upgrade.exp ++++ IbaTools/FastFabric/chassis_upgrade.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/configipoib.exp IbaTools/FastFabric/configipoib.exp +index 89644864873f..518f9b9e8d0e 100644 +--- IbaTools/FastFabric/configipoib.exp ++++ IbaTools/FastFabric/configipoib.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/ff_function.exp IbaTools/FastFabric/ff_function.exp +index a983673430dc..ca9312985981 100644 +--- IbaTools/FastFabric/ff_function.exp ++++ IbaTools/FastFabric/ff_function.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/ipoibping.exp IbaTools/FastFabric/ipoibping.exp +index da66c6e30e68..3782dd0b8751 100644 +--- IbaTools/FastFabric/ipoibping.exp ++++ IbaTools/FastFabric/ipoibping.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/load.exp IbaTools/FastFabric/load.exp +index dff1454a9eb3..cdfc60e1e456 100644 +--- IbaTools/FastFabric/load.exp ++++ IbaTools/FastFabric/load.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/mpiperf.exp IbaTools/FastFabric/mpiperf.exp +index 38d3012850ad..5f8cd41a94ca 100644 +--- IbaTools/FastFabric/mpiperf.exp ++++ IbaTools/FastFabric/mpiperf.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/mpiperfdeviation.exp IbaTools/FastFabric/mpiperfdeviation.exp +index a6ef318e96bd..e0139eb570c0 100644 +--- IbaTools/FastFabric/mpiperfdeviation.exp ++++ IbaTools/FastFabric/mpiperfdeviation.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/pfctest.exp IbaTools/FastFabric/pfctest.exp +index d7e386930e1d..8f9c41d56926 100644 +--- IbaTools/FastFabric/pfctest.exp ++++ IbaTools/FastFabric/pfctest.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2021, Intel Corporation +diff --git IbaTools/FastFabric/reboot.exp IbaTools/FastFabric/reboot.exp +index 0e996db987ff..d78d1f689b29 100644 +--- IbaTools/FastFabric/reboot.exp ++++ IbaTools/FastFabric/reboot.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/rping.exp IbaTools/FastFabric/rping.exp +index 2f5baee14ec4..088551715786 100644 +--- IbaTools/FastFabric/rping.exp ++++ IbaTools/FastFabric/rping.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2021, Intel Corporation +diff --git IbaTools/FastFabric/switch_capture.exp IbaTools/FastFabric/switch_capture.exp +index 3cd5d8ebc371..1fd92fe7d70a 100644 +--- IbaTools/FastFabric/switch_capture.exp ++++ IbaTools/FastFabric/switch_capture.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_configure.exp IbaTools/FastFabric/switch_configure.exp +index 3f2b74603776..8fec167283b5 100644 +--- IbaTools/FastFabric/switch_configure.exp ++++ IbaTools/FastFabric/switch_configure.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git IbaTools/FastFabric/switch_dump.exp IbaTools/FastFabric/switch_dump.exp +index 3b49d35dbcd3..5f46c0766e32 100644 +--- IbaTools/FastFabric/switch_dump.exp ++++ IbaTools/FastFabric/switch_dump.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_fwverify.exp IbaTools/FastFabric/switch_fwverify.exp +index 1f25e19b7846..c4cf5200184a 100644 +--- IbaTools/FastFabric/switch_fwverify.exp ++++ IbaTools/FastFabric/switch_fwverify.exp +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_getconfig.exp IbaTools/FastFabric/switch_getconfig.exp +index 805c66bcc8fb..b0fd04c4f620 100644 +--- IbaTools/FastFabric/switch_getconfig.exp ++++ IbaTools/FastFabric/switch_getconfig.exp +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_hwvpd.exp IbaTools/FastFabric/switch_hwvpd.exp +index 5ce50db4fd65..b05d476dae93 100644 +--- IbaTools/FastFabric/switch_hwvpd.exp ++++ IbaTools/FastFabric/switch_hwvpd.exp +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_info.exp IbaTools/FastFabric/switch_info.exp +index 59160b75eb81..91a2b8bd8a93 100644 +--- IbaTools/FastFabric/switch_info.exp ++++ IbaTools/FastFabric/switch_info.exp +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_ping.exp IbaTools/FastFabric/switch_ping.exp +index 98dbe587e596..74b2cc0275d4 100644 +--- IbaTools/FastFabric/switch_ping.exp ++++ IbaTools/FastFabric/switch_ping.exp +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_reboot.exp IbaTools/FastFabric/switch_reboot.exp +index 729ce11829cc..8cedb0923c5a 100644 +--- IbaTools/FastFabric/switch_reboot.exp ++++ IbaTools/FastFabric/switch_reboot.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/switch_upgrade.exp IbaTools/FastFabric/switch_upgrade.exp +index 181ac3435019..bf259b4ab4d0 100644 +--- IbaTools/FastFabric/switch_upgrade.exp ++++ IbaTools/FastFabric/switch_upgrade.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git IbaTools/FastFabric/upgrade.exp IbaTools/FastFabric/upgrade.exp +index 9abea72a6da7..29f62f69efcf 100644 +--- IbaTools/FastFabric/upgrade.exp ++++ IbaTools/FastFabric/upgrade.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2017, Intel Corporation +diff --git TestTools/basic.exp TestTools/basic.exp +index d648cf316b6f..1188cff6ad76 100644 +--- TestTools/basic.exp ++++ TestTools/basic.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/chassis.exp TestTools/chassis.exp +index 93265e2d30ed..488ab27fbbf1 100644 +--- TestTools/chassis.exp ++++ TestTools/chassis.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2020, Intel Corporation +diff --git TestTools/common_funcs.exp TestTools/common_funcs.exp +index 68d55d8fdf48..22bed8bdbb7e 100644 +--- TestTools/common_funcs.exp ++++ TestTools/common_funcs.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/defs.exp TestTools/defs.exp +index 8e1a8e6e816d..2081a2b64d1e 100644 +--- TestTools/defs.exp ++++ TestTools/defs.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/eth_to_xml.exp TestTools/eth_to_xml.exp +index f982ea3061ef..46bc7cbf9be6 100644 +--- TestTools/eth_to_xml.exp ++++ TestTools/eth_to_xml.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2020, Intel Corporation +diff --git TestTools/extmng.exp TestTools/extmng.exp +index 4cf47f2efd2b..b721f2f7a619 100644 +--- TestTools/extmng.exp ++++ TestTools/extmng.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2020, Intel Corporation +diff --git TestTools/ib.exp TestTools/ib.exp +index 1af64578dc37..c8ccbb7f733a 100644 +--- TestTools/ib.exp ++++ TestTools/ib.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/ibtools.exp TestTools/ibtools.exp +index 13d35666c27f..da23210d01a5 100644 +--- TestTools/ibtools.exp ++++ TestTools/ibtools.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/install.exp TestTools/install.exp +index 2be94861fe69..120b01d5e0e0 100644 +--- TestTools/install.exp ++++ TestTools/install.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/mpi.exp TestTools/mpi.exp +index 6b4958a9186e..a5b79b65b5f8 100644 +--- TestTools/mpi.exp ++++ TestTools/mpi.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2020, Intel Corporation +diff --git TestTools/network.exp TestTools/network.exp +index f934e0b3ce29..f2a6a94f3850 100644 +--- TestTools/network.exp ++++ TestTools/network.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/proc_mgr.exp TestTools/proc_mgr.exp +index 62b1829926ae..a3564310bdb7 100644 +--- TestTools/proc_mgr.exp ++++ TestTools/proc_mgr.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/sm_control.exp TestTools/sm_control.exp +index 7f08ccb0e6e0..e639b1a44132 100644 +--- TestTools/sm_control.exp ++++ TestTools/sm_control.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/switch_methods.exp TestTools/switch_methods.exp +index 75bfcaa0cbe3..fc5567b93bdb 100644 +--- TestTools/switch_methods.exp ++++ TestTools/switch_methods.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation +diff --git TestTools/target.exp TestTools/target.exp +index 6ca88902b993..fd4d7ae6e4ac 100644 +--- TestTools/target.exp ++++ TestTools/target.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015-2022, Intel Corporation +diff --git TestTools/tools.exp TestTools/tools.exp +index 0d15ff54ea3b..851707c27ee2 100644 +--- TestTools/tools.exp ++++ TestTools/tools.exp +@@ -1,3 +1,4 @@ ++#!/usr/bin/expect + # BEGIN_ICS_COPYRIGHT8 **************************************** + # + # Copyright (c) 2015, Intel Corporation diff --git a/eth-ff-suse-build-fixes.patch b/eth-ff-suse-build-fixes.patch new file mode 100644 index 0000000..d77da8b --- /dev/null +++ b/eth-ff-suse-build-fixes.patch @@ -0,0 +1,75 @@ +commit 4d2c1fa08842cf8d60cc3dc1dde30ecff585103c +Author: Nicolas Morey-Chaisemartin +Date: Thu Jun 8 11:11:01 2017 +0200 + + eth-ff suse build fixes + + Signed-off-by: Nicolas Morey-Chaisemartin + +diff --git Makerules/Defs.Flags Makerules/Defs.Flags +index e84324356f0a..9e34eafb8bad 100755 +--- Makerules/Defs.Flags ++++ Makerules/Defs.Flags +@@ -53,8 +53,8 @@ CCDEPENDFLAGS = $(CCFLAGS) $(DEPENDENV) $(DEPENDPROJ) $(DEPENDMOD) $(DEPENDLOCA + + CINCLUDE_DIRS = $(LOCAL_INCLUDE_DIRS) $(MOD_INCLUDE_DIRS) $(PROJ_INCLUDE_DIRS) $(SYS_INCLUDE_DIRS) + ifndef KERNELRELEASE +-CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CENVFS) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) +-CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCENVFS) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) ++CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CENVFS) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) ++CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCENVFS) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) + + LDFLAGS = $(LDMACH) $(LDSYS) $(LDENV) $(LDENVFS) $(LDPROJ) $(LDMOD) $(LDLOCAL) $(LDLIBSRCH) $(LDSTRIP) $(LDOUTPUT) + LD_LIB_DIRS = $(LOCAL_LIB_DIRS) $(MOD_LIB_DIRS) $(PROJ_LIB_DIRS) $(SYS_LIB_DIRS) +diff --git Makerules/Target.LINUX.INTEL.X86_64 Makerules/Target.LINUX.INTEL.X86_64 +index a373262676b5..3a6687d563cc 100755 +--- Makerules/Target.LINUX.INTEL.X86_64 ++++ Makerules/Target.LINUX.INTEL.X86_64 +@@ -132,6 +132,7 @@ endif + + endif + CKERNEL+=-include $(TL_DIR)/Makerules/LINUX/$(BUILD_TARGET).$(BUILD_TARGET_OS_VENDOR).$(BUILD_TARGET_OS_VERSION).h ++CKERNEL+= $(RPM_OPT_FLAGS) + + # Include directories for kernel + KERNELDIR=/lib/modules/$(BUILD_TARGET_OS_VERSION)/build +diff --git OpenIb_Host/LINUX/Makefile OpenIb_Host/LINUX/Makefile +index e7e8a4e7367b..5d2da73f8697 100644 +--- OpenIb_Host/LINUX/Makefile ++++ OpenIb_Host/LINUX/Makefile +@@ -283,7 +283,7 @@ package: + rm -rf $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \ + mkdir -p $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \ + cp -r $$dir/arch $$dir/distro $$dir/distro_version $$dir/os_id $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver 2>/dev/null; \ +- cp -r $$dir/INSTALL $$dir/comp.pl $$dir/README $$dir/version $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \ ++ cp -r $$dir/INSTALL $$dir/comp.pl $$dir/version $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \ + echo "$(RELEASE_DIR)/IntelEth-Tools-FF.$$ver.tgz" >> $(TL_DIR)/packaged_files; \ + echo "$(RELEASE_DIR)/IntelEth-Tools-FF.$$ver.tgz" >> $(TL_DIR)/dist_files; \ + echo "$(RELEASE_DIR)/IntelEth-Tools.$$ver.tgz" >> $(TL_DIR)/packaged_files; \ +diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh +index 4037aeeb0b1d..f98723d69ea6 100755 +--- OpenIb_Host/ff_build.sh ++++ OpenIb_Host/ff_build.sh +@@ -57,7 +57,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF} + # for FF the kernel rev is not important. We simply use the kernel rev + # of the running kernel. While BUILD_TARGET_OS_VERSION is needed by Makerules + # it will have no impact on what is actually built for FF +-export BUILD_TARGET_OS_VERSION=${BUILD_TARGET_OS_VERSION:-`uname -r`} ++export BUILD_TARGET_OS_VERSION=`uname -r` ++export BUILD_PLATFORM_OS_VENDOR="SuSE" ++export BUILD_TARGET_OS_VENDOR="SuSE" ++export BUILD_PLATFORM_OS_VENDOR_VERSION="OPENSUSE_BUILD_SYSTEM" ++export BUILD_TARGET_OS_VENDOR=$BUILD_PLATFORM_OS_VENDOR ++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 + +@@ -72,6 +78,7 @@ shift + set -x + { + echo "Environment:" ++ export BUILD_TARGET_OS_VERSION="4.4" + env + echo "----------------------------------------------------------------------------" + echo diff --git a/eth-ff.changes b/eth-ff.changes new file mode 100644 index 0000000..2102d97 --- /dev/null +++ b/eth-ff.changes @@ -0,0 +1,101 @@ +------------------------------------------------------------------- +Wed Oct 4 06:25:51 UTC 2023 - Nicolas Morey + +- Update to v11.5.1.0 + - improved to support SLES 15.5 + - replaced fgrep and egrep with grep -F and grep -E + - improved ethlinkanalysis/ethfabricanalysis to use first enabled + plane when it's not specified + - fixed version comparison issue on install script that happens on + CUDA version components + - improved help text and man page for all tools + +------------------------------------------------------------------- +Tue Jul 25 12:34:19 UTC 2023 - Nicolas Morey + +- Update to v11.5.0.0 + - improved ethreport to support more than 256 ports + - improved mpi_apps to still build as much as it can when fortran not available + - improved to support absolute ConfigDir path in mgt_config.xml + - fixed klocwork issues + - improved to support SLES 15.4 + - improved ethreport to support bulk query to reduce execution time + - improved ethreport to get VerdorID in a more stable way + - improved rping and pfctest execution time + - fixed timeout issue on pfctest when one node has "large" number of NICs + - improved ethcabletest and ethfindgood to support fabric plane + - improved mpiperf and mpiperfdeviation to support fabric plane + - improved ethreport with below new features: + - -P/-H: include only persist or hardware data + - -A/-o otherports: include all or other (inactive) ports + - -s: include performance data + - improved node verification to check NIC firmware and driver version + - improved FastFabric TUI to support multiple fabric planes + - limited max processes in pfctest to avoid ssh EOF error + - improved ethudstress to allow specifying port number + - added tool ethbw to monitor BW per NIC + - improved ethhostadmin to allow exiting on 1st failed operation + - enhanced error reporting and handling in rping and pfctest tool + - added support on Intel GPU (ONEAPI-ZE) + - fixed ethextract* tool to include performance data + - code cleanup. removed dead code and tools we do not support. + - updated MpiApps scripts to pass exe params to commands + - updated run_osu5 to provide a current list of benchmarks + - updated get_selected_mpi.sh to work with newer IMPI versions + - fixed MpiApps build script to allow building HPL with Intel MPI and MKL + - improved mpiperf and ethcabletest to support multi-rail + - improved ethreport and related tools to support specifying hostfile via -f + - changed openblas-devel to be optional prereq + - fixed klocwork issues in ethbw + - extended HPL-2.3 building to support different BLAS_TYPE + - enhanced ethscpall to allow copying data with rsync, specifying net interface to use, and tar compression option + - changed FastFabric to setup PFC using software DCB (open lldp) + - renamed FastFabric component "Eth RDMA" to "Eth RoCE" + - added lldpad as prereq + - fixed ethlinkanalysis/ethfabricanalysis to honor the ConfigDir defined in mgt_config + - added rping loopback test and PFC mode check in hostverify + - improved hostverify to support passive mode intel_pstate + - fixed ethcabletest to make -n option works properly + - enhanced ethreport -A to include host ports that have no IP address + - cleaned up ethreport error messages + - enhanced ethbw to support duration argument + - updated man pages for FastFabric tools + - updated man pages for FastFabric tools + - Fixed minor bugs on nodeverify.sh, ethshowallports and ethfindgood + - Improved below tools to support fabric plane + - ethcabletest.sh + - ethshowallports.sh + - ethhostadmin + - Improved to support RHEL 9.1 + - Fixed RV rebuild issue under SLES 15.4 to support Intel GPU + - Improved stability on ethcabletest and ethfindgood + - Added tool dsa_setup to aid creation of DSA devices + - Changed script shebang to use /bin/bash rather than /bin/sh + - Improved ethcapture to use journalctl if rsyslog not installed + - Improved to support Basic-IB package + - Refactoried package build scripts to better support different OSes + - Improved dsa_setup to support shared workqueue + - Cleaned OS detection code +- Refresh eth-ff-add-shebang-for-exp-files.patch +- Drop topology-fix-support-for-disabled-MD5-authentication.patch + which was fixed upstream. + +------------------------------------------------------------------- +Fri Jan 27 09:16:29 UTC 2023 - Nicolas Morey + +- Add topology-fix-support-for-disabled-MD5-authentication.patch to fix + compilation issues with net-snmp with disabled MD5 authentication. + +------------------------------------------------------------------- +Thu Sep 15 07:30:22 UTC 2022 - Nicolas Morey-Chaisemartin + +- Update to v11.3.0.0-130 (jsc#PED-349) + - added tool ethshmcleanup.sh for obsoleted shm file clean up + - added support to IMPI 2021.6 + - update MpiApps OSU to v5.9 + +------------------------------------------------------------------- +Thu Sep 30 09:26:20 UTC 2021 - Nicolas Morey-Chaisemartin + +- Initial packaging of v11.1.0.0 (jsc#SLE-19364) + diff --git a/eth-ff.rpmlintrc b/eth-ff.rpmlintrc new file mode 100644 index 0000000..3d1e99e --- /dev/null +++ b/eth-ff.rpmlintrc @@ -0,0 +1,2 @@ +addFilter("suse-filelist-forbidden-sysconfig") +addFilter("filelist-forbidden-sysconfig") diff --git a/eth-ff.spec b/eth-ff.spec new file mode 100644 index 0000000..df9c36a --- /dev/null +++ b/eth-ff.spec @@ -0,0 +1,233 @@ +# +# spec file for package eth-ff +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define git_ver .0.7188a97b9a39 + +%define pseudo_opt %{_prefix}/lib/eth-tools/ +%define ethsysconfdir %{_sysconfdir}/eth-tools/ + +Name: eth-ff +Version: 11.5.1.0 +Release: 0 +Summary: Intel Ethernet Fabric Suite basic tools and libraries for fabric management +License: BSD-3-Clause OR GPL-2.0-only +Group: Productivity/Networking/System +URL: https://github.com/intel/eth-fast-fabric +Source0: %{name}-%{version}%{git_ver}.tar.gz +Source1: eth-ff.rpmlintrc +Patch1: eth-ff-suse-build-fixes.patch +Patch2: eth-ff-add-shebang-for-exp-files.patch +BuildRequires: gcc-c++ +BuildRequires: infiniband-diags-devel +BuildRequires: libexpat-devel +BuildRequires: libopenssl-devel +BuildRequires: librdmacm1 +BuildRequires: ncurses-devel +BuildRequires: net-snmp-devel +BuildRequires: rdma-core-devel +BuildRequires: tcl-devel +BuildRequires: zlib-devel + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +#Currently ONLY builds on x86_64 +ExclusiveArch: x86_64 + +%description +The %{name} contains basic tools and libraries to manage an Intel Ethernet fabric. + +%package -n eth-basic-tools +Summary: Management level tools and scripts +Group: Productivity/Networking/System +Requires: rdma + +%description -n eth-basic-tools +Contains basic tools for fabric management necessary on all compute nodes. + +%package -n eth-fastfabric +Summary: Management level tools and scripts +Group: Productivity/Networking/System +Requires: cron +Requires: eth-basic-tools + +%description -n eth-fastfabric +Contains tools for managing fabric on a management node. + +%prep +%setup -q -n %{name}-%{version}%{git_ver} +%patch1 +%patch2 + +%build +export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-address-of-packed-member" +cd OpenIb_Host && ./ff_build.sh %{_builddir} $FF_BUILD_ARGS + +%install +. OpenIb_Host/ff_filegroups.sh + +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{pseudo_opt}/ +mkdir -p %{buildroot}%{pseudo_opt}samples +mkdir -p %{buildroot}%{ethsysconfdir} +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man8 +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/eth-tools + +#Binaries and scripts installing (basic tools) +cd $(cat %{_builddir}/RELEASE_PATH) + +cd bin +cp -t %{buildroot}%{_sbindir} ${basic_tools_sbin} +cp -t %{buildroot}/%{pseudo_opt}/ ${basic_tools_opt} + +cd ../fastfabric +cp -t %{buildroot}%{_sbindir} ${ff_tools_sbin} +cp -t %{buildroot}%{pseudo_opt} ${ff_tools_misc} +cp -t %{buildroot}%{ethsysconfdir} ${basic_configs} + +cd ../fastfabric/samples +cp -t %{buildroot}%{pseudo_opt}samples ${ff_iba_samples} ${basic_samples} +cd .. + +cd ../fastfabric/tools +chmod 755 *.exp +cp -t %{buildroot}%{pseudo_opt}/ ${ff_tools_exp} +cp -t %{buildroot}%{pseudo_opt}/ ${ff_libs_misc} +cp -t %{buildroot}%{pseudo_opt}/ osid_wrapper +cp -t %{buildroot}%{ethsysconfdir} allhosts hosts switches +cd .. + +cd ../man/man1 +cp -t %{buildroot}%{_mandir}/man1 ${basic_mans} +cd ../man8 +cp -t %{buildroot}%{_mandir}/man8 ${ff_mans} +cd .. + +#Config files +cd ../config +cp -t %{buildroot}/%{ethsysconfdir} ethmon.conf ethmon.si.conf + +# Now that we've put everything in the buildroot, copy any default config files to their expected location for user +# to edit. To prevent nuking existing user configs, the files section of this spec file will reference these as noreplace +# config files. +cp %{buildroot}%{pseudo_opt}/ethfastfabric.conf.def %{buildroot}/%{ethsysconfdir}/ethfastfabric.conf + +for file in $(ls %{buildroot}/%{ethsysconfdir}); do + ln -s %{ethsysconfdir}/$file %{buildroot}/etc/sysconfig/eth-tools/$file +done + +#Now we do a bunch of work to build the file listing of what belongs to each RPM + +# List for basic +( + #Basic tools sbin + for file in ${basic_tools_sbin} ${basic_tools_sbin_sym}; do + echo "%{_sbindir}/${file}" + done + #Basic tools opt + for file in ${basic_tools_opt}; do + echo "%{pseudo_opt}/${file}" + done + #Basic man pages + for file in ${basic_mans}; do + # Extra wildcard to accept .1.gz + echo "%{_mandir}/man1/${file}*" + done + #Basic config pages + for file in ${basic_configs}; do + echo "%config(noreplace) %{ethsysconfdir}${file}" + done +) > %{_builddir}/basic_file.list + +# List for eth-fastfabric +( + #FF tools opt + for file in ${ff_tools_opt}; do + echo "%{pseudo_opt}/${file}" + done + + #FF exp files opt + for file in ${ff_tools_exp}; do + echo "%{pseudo_opt}/${file}" + done + + #FF misc files opt + for file in ${ff_tools_misc}; do + echo "%{pseudo_opt}/${file}" + done + + #FF libs misc + for file in ${ff_libs_misc}; do + echo "%{pseudo_opt}/${file}" + done + + #FF iba samples + for file in ${ff_iba_samples} ${basic_samples}; do + echo "%{pseudo_opt}samples/${file}" + done + + #FF tools to FM configuration + for file in ${ff_tools_fm}; do + echo "%{pseudo_opt}fm_tools/${file}" + done + + #FF man pages + for file in ${ff_mans}; do + # Extra wildcard to accept .8.gz + echo "%{_mandir}/man8/${file}*" + done + + #FF tools help doc + for file in ${help_doc}; do + echo "%{pseudo_opt}help/${file}" + done + + #FF tools sbin + for file in ${ff_tools_sbin}; do + echo "%{_sbindir}/${file}" + done + +) > %{_builddir}/ff_file.list + +%files -n eth-basic-tools -f %{_builddir}/basic_file.list +%defattr(-,root,root,-) +%dir %{pseudo_opt} +%dir %{ethsysconfdir} + +%doc README +%license LICENSE + +%files -n eth-fastfabric -f %{_builddir}/ff_file.list +%defattr(-,root,root,0755) +%dir %{pseudo_opt} +%dir %{pseudo_opt}samples +%{pseudo_opt}/osid_wrapper + +%dir %{_sysconfdir}/sysconfig/eth-tools +%dir %{ethsysconfdir} +%{_sysconfdir}/sysconfig/eth-tools/* + +%config(noreplace) %{ethsysconfdir}/ethfastfabric.conf +%config(noreplace) %{ethsysconfdir}/ethmon.conf +%config(noreplace) %{ethsysconfdir}/ethmon.si.conf +%config(noreplace) %{ethsysconfdir}/allhosts +%config(noreplace) %{ethsysconfdir}/hosts +%config(noreplace) %{ethsysconfdir}/switches + +%changelog