From a028fa501fb1251e58b73bf2040a1a040a220b51 Mon Sep 17 00:00:00 2001 From: Packit Date: Sep 10 2020 11:21:10 +0000 Subject: Apply patch update-ff-install-script.patch patch_name: update-ff-install-script.patch present_in_specfile: true --- diff --git a/OpenIb_Host/ff_filegroups.sh b/OpenIb_Host/ff_filegroups.sh index e7a0d8f..e457b6e 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 - opapacketcapture opaportinfo oparesolvehfiport opasaquery opasmaquery + 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 opapacketcapture.1 opapmaquery.1 + opagetvf_env.1 opahfirev.1 opainfo.1 opapmaquery.1 opaportconfig.1 opaportinfo.1 oparesolvehfiport.1 opasaquery.1 opasmaquery.1" @@ -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" -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 9430648..3da59bb 100755 --- a/OpenIb_Host/ff_install.sh +++ b/OpenIb_Host/ff_install.sh @@ -29,10 +29,8 @@ 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 @@ -52,7 +50,6 @@ 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) @@ -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 ../../ - #Config files cd ../config cp -t ${DESTDIR}/etc/rdma dsap.conf