From 996e8941d71f2439250c7b869d43ab3972d7463c Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 23:55:59 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/Dsap/Makefile b/Dsap/Makefile index e66d0aa..64aeb2d 100644 --- a/Dsap/Makefile +++ b/Dsap/Makefile @@ -133,8 +133,8 @@ include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] # (Windows Only) -COPT ?= # set by CKERNEL for drivers -CCOPT ?= # set by CKERNEL for drivers +COPT = # set by CKERNEL for drivers +CCOPT = # set by CKERNEL for drivers #=============================================================================# #=============================================================================# diff --git a/Esm/ib/src/linux/startup/fm_config/Makefile b/Esm/ib/src/linux/startup/fm_config/Makefile index cd3f301..c4108fa 100644 --- a/Esm/ib/src/linux/startup/fm_config/Makefile +++ b/Esm/ib/src/linux/startup/fm_config/Makefile @@ -150,10 +150,10 @@ include $(TL_DIR)/Makerules/Maketargets.build include $(TL_DIR)/Makerules/Maketargets.install $(BUILDDIR)/config_check: $(BUILDDIR)/config_check.o - $(VS)$(CC) -pie $(LDFLAGS)$@ $(BUILDDIR)/config_check.o $(LDLIBS) + $(VS)$(CC) $(LDFLAGS)$@ $(BUILDDIR)/config_check.o $(LDLIBS) $(BUILDDIR)/config_convert: $(BUILDDIR)/config_convert.o - $(VS)$(CC) -pie $(LDFLAGS)$@ $(BUILDDIR)/config_convert.o $(LDLIBS) + $(VS)$(CC) $(LDFLAGS)$@ $(BUILDDIR)/config_convert.o $(LDLIBS) # install for stage phase #include $(TL_DIR)/Makerules/Maketargets.stage diff --git a/IbaTools/FastFabric/chassis_configure.exp b/IbaTools/FastFabric/chassis_configure.exp index e373a46..f18397f 100644 --- a/IbaTools/FastFabric/chassis_configure.exp +++ b/IbaTools/FastFabric/chassis_configure.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmconfig.exp b/IbaTools/FastFabric/chassis_fmconfig.exp index 8040a37..9ec04cc 100644 --- a/IbaTools/FastFabric/chassis_fmconfig.exp +++ b/IbaTools/FastFabric/chassis_fmconfig.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmcontrol.exp b/IbaTools/FastFabric/chassis_fmcontrol.exp index 2d69a0b..477953a 100644 --- a/IbaTools/FastFabric/chassis_fmcontrol.exp +++ b/IbaTools/FastFabric/chassis_fmcontrol.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmgetconfig.exp b/IbaTools/FastFabric/chassis_fmgetconfig.exp index 200d2d1..2e61cde 100644 --- a/IbaTools/FastFabric/chassis_fmgetconfig.exp +++ b/IbaTools/FastFabric/chassis_fmgetconfig.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp index 731b6ca..d31e055 100644 --- a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +++ b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp index 5f162b8..5c2a45d 100644 --- a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp +++ b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_getconfig.exp b/IbaTools/FastFabric/chassis_getconfig.exp index 4d7b265..7454afc 100644 --- a/IbaTools/FastFabric/chassis_getconfig.exp +++ b/IbaTools/FastFabric/chassis_getconfig.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_reboot.exp b/IbaTools/FastFabric/chassis_reboot.exp index 36b1ef0..b5f1f39 100644 --- a/IbaTools/FastFabric/chassis_reboot.exp +++ b/IbaTools/FastFabric/chassis_reboot.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_upgrade.exp b/IbaTools/FastFabric/chassis_upgrade.exp index df0eb7a..b2aa797 100644 --- a/IbaTools/FastFabric/chassis_upgrade.exp +++ b/IbaTools/FastFabric/chassis_upgrade.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/configipoib.exp b/IbaTools/FastFabric/configipoib.exp index f6b29b7..1067311 100644 --- a/IbaTools/FastFabric/configipoib.exp +++ b/IbaTools/FastFabric/configipoib.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/ff_function.exp b/IbaTools/FastFabric/ff_function.exp index 73ca780..ab64a00 100644 --- a/IbaTools/FastFabric/ff_function.exp +++ b/IbaTools/FastFabric/ff_function.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/ipoibping.exp b/IbaTools/FastFabric/ipoibping.exp index 5256620..5739e60 100644 --- a/IbaTools/FastFabric/ipoibping.exp +++ b/IbaTools/FastFabric/ipoibping.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/load.exp b/IbaTools/FastFabric/load.exp index 0a6b394..b9d0751 100644 --- a/IbaTools/FastFabric/load.exp +++ b/IbaTools/FastFabric/load.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/mpiperf.exp b/IbaTools/FastFabric/mpiperf.exp index c5cab3b..3b69e3a 100644 --- a/IbaTools/FastFabric/mpiperf.exp +++ b/IbaTools/FastFabric/mpiperf.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/mpiperfdeviation.exp b/IbaTools/FastFabric/mpiperfdeviation.exp index 48882e7..bcd9839 100644 --- a/IbaTools/FastFabric/mpiperfdeviation.exp +++ b/IbaTools/FastFabric/mpiperfdeviation.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/reboot.exp b/IbaTools/FastFabric/reboot.exp index 1f9d7d9..53fc4b6 100644 --- a/IbaTools/FastFabric/reboot.exp +++ b/IbaTools/FastFabric/reboot.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/sacache.exp b/IbaTools/FastFabric/sacache.exp index ae5f560..b9c188d 100644 --- a/IbaTools/FastFabric/sacache.exp +++ b/IbaTools/FastFabric/sacache.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_capture.exp b/IbaTools/FastFabric/switch_capture.exp index ceebd2b..4e7054d 100644 --- a/IbaTools/FastFabric/switch_capture.exp +++ b/IbaTools/FastFabric/switch_capture.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_configure.exp b/IbaTools/FastFabric/switch_configure.exp index 91fa0ba..3516482 100644 --- a/IbaTools/FastFabric/switch_configure.exp +++ b/IbaTools/FastFabric/switch_configure.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/switch_dump.exp b/IbaTools/FastFabric/switch_dump.exp index fe99822..dae0e5b 100644 --- a/IbaTools/FastFabric/switch_dump.exp +++ b/IbaTools/FastFabric/switch_dump.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_fwverify.exp b/IbaTools/FastFabric/switch_fwverify.exp index 449401e..7cf1101 100644 --- a/IbaTools/FastFabric/switch_fwverify.exp +++ b/IbaTools/FastFabric/switch_fwverify.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_getconfig.exp b/IbaTools/FastFabric/switch_getconfig.exp index 3944766..30d6b3f 100644 --- a/IbaTools/FastFabric/switch_getconfig.exp +++ b/IbaTools/FastFabric/switch_getconfig.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_hwvpd.exp b/IbaTools/FastFabric/switch_hwvpd.exp index dfb1ef2..266518c 100644 --- a/IbaTools/FastFabric/switch_hwvpd.exp +++ b/IbaTools/FastFabric/switch_hwvpd.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_info.exp b/IbaTools/FastFabric/switch_info.exp index cfecfce..735a5e5 100644 --- a/IbaTools/FastFabric/switch_info.exp +++ b/IbaTools/FastFabric/switch_info.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_ping.exp b/IbaTools/FastFabric/switch_ping.exp index 8230dc2..8773345 100644 --- a/IbaTools/FastFabric/switch_ping.exp +++ b/IbaTools/FastFabric/switch_ping.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_reboot.exp b/IbaTools/FastFabric/switch_reboot.exp index 572f92f..1ee19ea 100644 --- a/IbaTools/FastFabric/switch_reboot.exp +++ b/IbaTools/FastFabric/switch_reboot.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_upgrade.exp b/IbaTools/FastFabric/switch_upgrade.exp index 336572b..6c5c104 100644 --- a/IbaTools/FastFabric/switch_upgrade.exp +++ b/IbaTools/FastFabric/switch_upgrade.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/upgrade.exp b/IbaTools/FastFabric/upgrade.exp index cae30ad..dd4abe5 100644 --- a/IbaTools/FastFabric/upgrade.exp +++ b/IbaTools/FastFabric/upgrade.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/stream/Makefile b/IbaTools/stream/Makefile index 9284a91..7ed670d 100644 --- a/IbaTools/stream/Makefile +++ b/IbaTools/stream/Makefile @@ -125,7 +125,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] # (Windows Only) -COPT ?= -O3 +COPT = -O3 #=============================================================================# #=============================================================================# diff --git a/Makerules/Maketargets.build b/Makerules/Maketargets.build index 9cd7844..ebf9fdf 100755 --- a/Makerules/Maketargets.build +++ b/Makerules/Maketargets.build @@ -127,7 +127,7 @@ else # BUILD_TARGET_OS is not VXWORKS $(CMD_TARGETS_EXE) : $(CT_OBJECTS) $(RSCOBJECTS) $(DEPLIBS_TARGETS) @echo Linking executable... @mkdir -p $(dir $@) - $(VS)$(CC) -pie $(LDFLAGS)$@ $(CT_OBJECTS) $(LDLIBS) + $(VS)$(CC) $(LDFLAGS)$@ $(CT_OBJECTS) $(LDLIBS) endif # BUILD_TARGET_OS is VXWORKS endif # CMD_TARGETS_EXE non-null diff --git a/OpenIb_Host/ff_filegroups.sh b/OpenIb_Host/ff_filegroups.sh index e457b6e..e7a0d8f 100644 --- a/OpenIb_Host/ff_filegroups.sh +++ b/OpenIb_Host/ff_filegroups.sh @@ -1,5 +1,5 @@ basic_tools_sbin="opacapture opafabricinfo opagetvf opagetvf_env opahfirev - opaportinfo oparesolvehfiport opasaquery opasmaquery + opapacketcapture opaportinfo oparesolvehfiport opasaquery opasmaquery opainfo" basic_tools_sbin_sym="opapmaquery opaportconfig" @@ -7,7 +7,7 @@ basic_tools_sbin_sym="opapmaquery opaportconfig" basic_tools_opt="setup_self_ssh usemem opaipcalc stream" basic_mans="opacapture.1 opafabricinfo.1 opagetvf.1 - opagetvf_env.1 opahfirev.1 opainfo.1 opapmaquery.1 + opagetvf_env.1 opahfirev.1 opainfo.1 opapacketcapture.1 opapmaquery.1 opaportconfig.1 opaportinfo.1 oparesolvehfiport.1 opasaquery.1 opasmaquery.1" @@ -91,4 +91,16 @@ 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" +opamgt_examples="paquery.c saquery.c simple_sa_query.c simple_sa_notice.c simple_pa_query.c + job_schedule.c show_switch_cost_matrix.c Makefile README" + +mpi_apps_files="Makefile mpi_hosts.sample README prepare_run select_mpi run_bw + get_selected_mpi.sh get_mpi_cc.sh *.params gen_group_hosts gen_mpi_hosts + mpi_cleanup stop_daemons hpl_dat_gen config_hpl2 run_hpl2 run_lat run_imb run_lat2 + run_bw2 run_bibw2 run_bcast2 run_app runmyapp mpicheck run_mpicheck run_deviation + run_multibw run_mpi_stress run_osu run_cabletest run_allhfilatency run_nxnlatbw + run_alltoall3 run_bcast3 run_bibw3 run_bw3 run_lat3 run_mbw_mr3 run_multi_lat3 + run_batch_script run_batch_cabletest hpl-count.diff groupstress deviation + hpl-config/HPL.dat-* hpl-config/README mpicc mpif77" + opasnapconfig_bin= diff --git a/OpenIb_Host/ff_install.sh b/OpenIb_Host/ff_install.sh index 3da59bb..9430648 100755 --- a/OpenIb_Host/ff_install.sh +++ b/OpenIb_Host/ff_install.sh @@ -29,8 +29,10 @@ mkdir -p ${DESTDIR}/etc/opa mkdir -p ${DESTDIR}/etc/cron.d mkdir -p ${DESTDIR}/usr/include/infiniband mkdir -p ${DESTDIR}/usr/include/opamgt/iba/public +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 #Binaries and scripts installing (basic tools) #cd builtbin.OPENIB_FF.release @@ -50,6 +52,7 @@ cd ../opamgt cp -t ${DESTDIR}/usr/include/opamgt $opamgt_headers cp -t ${DESTDIR}/usr/include/opamgt/iba $opamgt_iba_headers cp -t ${DESTDIR}/usr/include/opamgt/iba/public $opamgt_iba_public_headers +cp -t ${DESTDIR}/usr/src/opamgt $opamgt_examples OPAMGT_VERNO_MAJOR=$(cat version | cut -d . -f 1) @@ -89,6 +92,10 @@ 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 ../../ + #Config files cd ../config cp -t ${DESTDIR}/etc/rdma dsap.conf diff --git a/TestTools/basic.exp b/TestTools/basic.exp index b3362ab..4ffe1f5 100644 --- a/TestTools/basic.exp +++ b/TestTools/basic.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/chassis.exp b/TestTools/chassis.exp index bd53bfe..152d7d9 100644 --- a/TestTools/chassis.exp +++ b/TestTools/chassis.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/common_funcs.exp b/TestTools/common_funcs.exp index 7f62eb8..68d55d8 100644 --- a/TestTools/common_funcs.exp +++ b/TestTools/common_funcs.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/defs.exp b/TestTools/defs.exp index ecb3e64..8e1a8e6 100644 --- a/TestTools/defs.exp +++ b/TestTools/defs.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/extmng.exp b/TestTools/extmng.exp index d9ffd03..d250d50 100644 --- a/TestTools/extmng.exp +++ b/TestTools/extmng.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/ib.exp b/TestTools/ib.exp index 8e949cd..06c4a6e 100644 --- a/TestTools/ib.exp +++ b/TestTools/ib.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/ibtools.exp b/TestTools/ibtools.exp index 36bfdbf..36b945c 100644 --- a/TestTools/ibtools.exp +++ b/TestTools/ibtools.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/install.exp b/TestTools/install.exp index 8f64eb3..7736765 100644 --- a/TestTools/install.exp +++ b/TestTools/install.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/mpi.exp b/TestTools/mpi.exp index 05fedfa..4fe36e9 100644 --- a/TestTools/mpi.exp +++ b/TestTools/mpi.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/network.exp b/TestTools/network.exp index b91a1ed..c1b8867 100644 --- a/TestTools/network.exp +++ b/TestTools/network.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/opa_to_xml.exp b/TestTools/opa_to_xml.exp index 9e0d8bc..448bfb4 100644 --- a/TestTools/opa_to_xml.exp +++ b/TestTools/opa_to_xml.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/proc_mgr.exp b/TestTools/proc_mgr.exp index 94cb60f..abcb65d 100644 --- a/TestTools/proc_mgr.exp +++ b/TestTools/proc_mgr.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/sm_control.exp b/TestTools/sm_control.exp index bc89ad4..7f08ccb 100644 --- a/TestTools/sm_control.exp +++ b/TestTools/sm_control.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/switch_methods.exp b/TestTools/switch_methods.exp index 3b2b14f..9f13773 100644 --- a/TestTools/switch_methods.exp +++ b/TestTools/switch_methods.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/target.exp b/TestTools/target.exp index 305757a..b10d199 100644 --- a/TestTools/target.exp +++ b/TestTools/target.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/tools.exp b/TestTools/tools.exp index aa7f825..850e789 100644 --- a/TestTools/tools.exp +++ b/TestTools/tools.exp @@ -1,4 +1,3 @@ -#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/opasadb/path_tools/cache/Makefile b/opasadb/path_tools/cache/Makefile index 61b9ec9..769bad7 100644 --- a/opasadb/path_tools/cache/Makefile +++ b/opasadb/path_tools/cache/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # C++ optimization flags, default lets build config decide #CCOPT = # C optimization flags, default lets build config decide -COPT ?= -g -D_GNU_SOURCE -Wall -fPIE +COPT = -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/dump/Makefile b/opasadb/path_tools/dump/Makefile index ecc91d7..4562df3 100644 --- a/opasadb/path_tools/dump/Makefile +++ b/opasadb/path_tools/dump/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # C++ optimization flags, default lets build config decide #CCOPT = # C optimization flags, default lets build config decide -COPT ?= -g -D_GNU_SOURCE -Wall -fPIE +COPT = -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/exercise/Makefile b/opasadb/path_tools/exercise/Makefile index 2f164ee..ebed0f5 100644 --- a/opasadb/path_tools/exercise/Makefile +++ b/opasadb/path_tools/exercise/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # C++ optimization flags, default lets build config decide #CCOPT = # C optimization flags, default lets build config decide -COPT ?= -g -D_GNU_SOURCE -Wall -fPIE +COPT = -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/load/Makefile b/opasadb/path_tools/load/Makefile index 640d284..4e9d10b 100644 --- a/opasadb/path_tools/load/Makefile +++ b/opasadb/path_tools/load/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # C++ optimization flags, default lets build config decide #CCOPT = # C optimization flags, default lets build config decide -COPT ?= -g -D_GNU_SOURCE -Wall -fPIE +COPT = -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/perf/Makefile b/opasadb/path_tools/perf/Makefile index b3e448c..5029c4a 100644 --- a/opasadb/path_tools/perf/Makefile +++ b/opasadb/path_tools/perf/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # C++ optimization flags, default lets build config decide #CCOPT = # C optimization flags, default lets build config decide -COPT ?= -g -D_GNU_SOURCE -Wall -fPIE +COPT = -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/query/Makefile b/opasadb/path_tools/query/Makefile index 75fe5c4..0b6e480 100644 --- a/opasadb/path_tools/query/Makefile +++ b/opasadb/path_tools/query/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # C++ optimization flags, default lets build config decide #CCOPT = # C optimization flags, default lets build config decide -COPT ?= -g -D_GNU_SOURCE -Wall -fPIE +COPT = -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/query/opa_osd_query.c b/opasadb/path_tools/query/opa_osd_query.c index fa43c5e..1f3371d 100644 --- a/opasadb/path_tools/query/opa_osd_query.c +++ b/opasadb/path_tools/query/opa_osd_query.c @@ -145,7 +145,7 @@ int main(int argc, char **argv) switch (c) { case 'v': debug = strtol(optarg,NULL,0); op_log_set_level(debug); break; - case 'h': hfi_name = (char*)strdup(optarg); break; + case 'h': hfi_name = (char*)strdupa(optarg); break; case 'p': port = strtol(optarg,NULL,0); break; case 's': query.slid = htons(strtol(optarg,NULL,0)); break; case 'd': query.dlid = htons(strtol(optarg,NULL,0)); break; @@ -154,13 +154,13 @@ int main(int argc, char **argv) case 'S': if (!parse_gid(optarg, &query.sgid)) { fprintf(stderr, "Badly formatted SGID.\n"); - goto out; + return -1; } break; case 'D': if (!parse_gid(optarg, &query.dgid)) { fprintf(stderr, "Badly formatted DGID.\n"); - goto out; + return -1; } break; case '$': @@ -178,7 +178,7 @@ int main(int argc, char **argv) print_path_record("Query Parameters", &query); if ((query.pkey != 0) && (query.service_id != 0)) { fprintf(stderr, "Query using both Service ID and PKey not supported\n"); - goto out; + return -1; } /* * Finds and opens the HFI. @@ -186,7 +186,7 @@ int main(int argc, char **argv) hfi = op_path_find_hfi(hfi_name,&device); if (!device || !hfi) { fprintf(stderr, "Could not open device %s, error code %d\n", (hfi_name?hfi_name:""), errno); - goto out; + return -1; } else { fprintf(stderr,"Using device %s\n", device->name); @@ -201,7 +201,7 @@ int main(int argc, char **argv) fprintf(stderr, "Could not access the Distributed SA. This may mean that\n" "the ibacm/dsap has not been started, or that it has not been able\n" "to contact the SA.\n"); - goto out; + return -1; } err = op_path_get_path_by_rec(context, @@ -222,12 +222,5 @@ int main(int argc, char **argv) ibv_close_device(hfi); op_path_close(context); - if (hfi_name) - free(hfi_name); - return 0; -out: - if (hfi_name) - free(hfi_name); - return -1; } diff --git a/opasadb/path_tools/query_many/Makefile b/opasadb/path_tools/query_many/Makefile index 295fe8f..b7ff7d4 100644 --- a/opasadb/path_tools/query_many/Makefile +++ b/opasadb/path_tools/query_many/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module # C++ optimization flags, default lets build config decide #CCOPT = # C optimization flags, default lets build config decide -COPT ?= -g -D_GNU_SOURCE -Wall -fPIE +COPT = -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none]