...
 
Commits (5)
......@@ -242,7 +242,7 @@ int getXMLConfigData(uint8_t *buffer, uint32_t bufflen, uint32_t *filelen)
buffer[index++] = nextByte;
if (index >= bufflen) {
*filelen = 0;
IB_LOG_ERROR("Buffer overrun geting ESM config file! rc:",0x0020);
IB_LOG_ERROR("Buffer overrun getting ESM config file! rc:",0x0020);
fclose(file);
return -1;
}
......
......@@ -109,7 +109,7 @@ opascpall a b c /root/tools/
.br
.br
# copy to an explitly specified set of hosts
# copy to an explicitly specified set of hosts
.br
opascpall -h \[aq]arwen elrond\[aq] a b c /root/tools
.br
......
......@@ -246,7 +246,7 @@ test_pcicfg()
failure=0
cd "${outdir}" || fail "Can't cd ${outdir}"
lspci="${lspci:-/sbin/lspci}"
lspci="${lspci:-/usr/bin/lspci}"
[ ! -x "${lspci}" ] && fail "Can't find lspci"
# get OmniPath Intel stand-alone WFR HFI
......@@ -314,7 +314,7 @@ test_pcispeed()
failure=0
cd "${outdir}" || fail "Can't cd ${outdir}"
lspci="${lspci:-/sbin/lspci}"
lspci="${lspci:-/usr/bin/lspci}"
[ ! -x "${lspci}" ] && fail "Can't find lspci"
# get OmniPath Intel stand-alone WFR HFI
......@@ -506,8 +506,8 @@ test_hfi_pkt()
date
cd "${outdir}" || fail "Can't cd ${outdir}"
lspci="${lspci:-/sbin/lspci}"
setpci="${setpci:-/sbin/setpci}"
lspci="${lspci:-/usr/bin/lspci}"
setpci="${setpci:-/usr/bin/setpci}"
[ ! -x "${lspci}" ] && fail "Can't find lspci"
[ ! -x "${setpci}" ] && fail "Can't find setpci"
......
......@@ -70,7 +70,7 @@ fi
BASEDIR=/sys/bus/pci/devices
hfis=`lspci -nn -D -d '8086:*' | egrep -e "24f[01]|Omni-Path" | grep -vi bridge | cut -d\ -f1`
hfis=`/usr/bin/lspci -nn -D -d '8086:*' | egrep -e "24f[01]|Omni-Path" | grep -vi bridge | cut -d\ -f1`
if [ -z "$hfis" ]
then
......
......@@ -1314,7 +1314,7 @@ void usage(void)
fprintf(stderr, " 0x00000040 6 Link Error Downed\n");
fprintf(stderr, " 0x00000020 5 Uncorrectable Errors\n");
fprintf(stderr, " \n");
fprintf(stderr, " select bits for clrVfPortCounters (0 is least signficant (rightmost))\n");
fprintf(stderr, " select bits for clrVfPortCounters (0 is least significant (rightmost))\n");
fprintf(stderr, " mask bit location \n");
fprintf(stderr, " 0x80000000 31 VLXmitData \n");
fprintf(stderr, " 0x40000000 30 VLRcvData \n");
......@@ -1330,7 +1330,7 @@ void usage(void)
fprintf(stderr, " 0x00100000 20 VLXmitWaitData\n");
fprintf(stderr, " 0x00080000 19 VLRcvBubble \n");
fprintf(stderr, " 0x00040000 18 VLMarkFECN\n");
fprintf(stderr, " Bits 17-0 reseved\n");
fprintf(stderr, " Bits 17-0 reserved\n");
fprintf(stderr, " -f/--focus - focus select value for getting focus ports\n");
fprintf(stderr, " focus select values:\n");
fprintf(stderr, " unexpclrport - lists unexpectedly cleared ports - LID ordered\n"); // STL_PA_SELECT_UNEXP_CLR_PORT 0x00010101
......
......@@ -722,10 +722,19 @@ function os_vendor()
centos)
rval=redhat
;;
debian)
rval=debian
;;
ubuntu)
rval=ubuntu
;;
*)
rval=""
;;
esac
if [ -e /etc/qlustar-version ]; then
rval=qlustar
fi
elif [ `uname -s` == "Darwin" ]
then
# Apple Mac
......@@ -775,11 +784,19 @@ function os_vendor_version()
# - use VERSION_ID - it has a common format among distros
# - mimic old way and drop $minor if eq 0 (see redhat handling below)
# - drop '.'(dot)
if [ $1 = "ubuntu" ]; then
rval=ES$(echo $VERSION_ID | sed -e 's/\.//')
else
rval=ES$(echo $VERSION_ID | sed -e 's/\.[0]//' -e 's/\.//')
fi
if [ $1 = "ubuntu" ]; then
rval=ES$(echo $VERSION_ID | sed -e 's/\.//')
elif [ $1 = "debian" ]; then
if [ -z "$VERSION_ID" ]; then
rval=9999 # sid
else
rval=$(echo $VERSION_ID | sed -e 's/\.[0]//' -e 's/\.//')
fi
elif [ $1 = "qlustar" ]; then
rval=$(cat /etc/qlustar-version | sed -e 's/\.[0]//' -e 's/\.//')
else
rval=ES$(echo $VERSION_ID | sed -e 's/\.[0]//' -e 's/\.//')
fi
echo $rval
return
fi
......
......@@ -132,25 +132,39 @@ echo "Capture Info: Detail: $detail; Date: $(date)" >> /$dir/capture_info
echo "Getting software and firmware version information ..."
echo "[ICS VERSION STRING: unknown]" > /$dir/sw_version
uname -a > /$dir/os_version
if [ -f /etc/debian_version ]; then
dpkg-query -W --showformat='${db:Status-Abbrev}: ${binary:Package}-${Version}-${Architecture}\n' > /$dir/debs.detailed
dpkg-query -W > /$dir/debs
else
# we use query format so we can get ARCH information
rpm --queryformat '[%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n]' -qa > /$dir/rpms.detailed
# get simple version just to be safe
rpm -qa > /$dir/rpms
fi
sha256sum /usr/lib/opa-fm/runtime/sm > /$dir/sha256sums
sha256sum /usr/lib/opa-fm/runtime/fe >> /$dir/sha256sums
echo "Capturing FM binaries and debuginfo if available"
if [ -f /etc/debian_version ]; then
dpkg-query -l opa-fm-dbg > /dev/null 2>&1
if [ $? -eq 0 ]; then
debuginfofiles=$(dpkg-query -L opa-fm-dbg | xargs -I% bash -c "if [ -f % ]; then echo %; fi")
tar -zcf /$dir/opa-fm-dbg.tgz $debuginfofiles > /dev/null 2>&1
unset debuginfofiles
fi
else
rpm -q opa-fm-debuginfo > /dev/null 2>&1
if [ $? -eq 0 ]; then
debuginfofiles=$(rpm -ql opa-fm-debuginfo | xargs -I% bash -c "if [ -f % ]; then echo %; fi")
tar -zcf /$dir/opa-fm-debuginfo.tgz $debuginfofiles > /dev/null 2>&1
unset debuginfofiles
fi
fi
tar -zcf /$dir/opa-fm-bins.tgz /usr/lib/opa-fm/runtime/ > /dev/null 2>&1
# Finding the PCI devices
for fw in `lspci -n | grep "8086:24f0"`
for fw in `/usr/bin/lspci -n | grep "8086:24f0"`
do
# Just get the PCI info for now...
echo "$fw" >> /$dir/fw_info
......@@ -186,7 +200,11 @@ runlevel > /$dir/runlevel # not available on all OSs
if [ $(command -v systemctl) ]; then
systemctl list-unit-files > /$dir/chkconfig.systemd
fi
if [ -f /etc/debian_version ]; then
:
else
chkconfig --list > /$dir/chkconfig 2>/dev/null
fi
ulimit -a > /$dir/ulimit
uptime > /$dir/uptime
......@@ -255,7 +273,11 @@ do
done
echo "Obtaining additional CPU info..."
if [ -f /etc/debian_version ]; then
cpufreq-info > /$dir/cpupower-freq-info
else
cpupower frequency-info > /$dir/cpupower-freq-info
fi
# Check if HFI driver debug data dir) is present; log only if present
HFI_DEBUGDIR="/sys/kernel/debug/hfi1"
......@@ -485,7 +507,7 @@ fi
cd /
files="$dir"
for f in var/log/opa* var/log/ics_* var/log/messages* var/log/ksyms.* var/log/boot* etc/*release* etc/sysconfig/ipoib.cfg* etc/opa etc/modules.conf* etc/modprobe.conf* etc/sysconfig/network-scripts/ifcfg* etc/dapl/ibhosts etc/hosts etc/sysconfig/boot etc/sysconfig/firstboot etc/dat.conf etc/sysconfig/network/ifcfg* etc/infiniband etc/sysconfig/*config etc/security etc/opa-fm/opafm.xml etc/sysconfig/iview_fm.config var/log/fm* var/log/sm* var/log/bm* var/log/pm* var/log/fe* var/log/opensm* var/log/ipath* etc/rc.d/rc.local etc/modprobe.d boot/grub/menu.lst boot/grub/grub.conf boot/grub2/grub.cfg boot/grub2/grubenv boot/grub2/device.map etc/grub*.conf etc/udev* etc/opensm etc/sysconfig/opensm etc/rdma/* etc/modprobe.d/* etc/dracut.conf.d/* etc/nsswitch.conf etc/sysconfig/irqbalance
for f in var/log/opa* var/log/ics_* var/log/messages* var/log/ksyms.* var/log/boot* etc/*release* etc/network/interfaces etc/network/interfaces.d/* etc/sysconfig/ipoib.cfg* etc/opa etc/modules.conf* etc/modprobe.conf* etc/sysconfig/network-scripts/ifcfg* etc/dapl/ibhosts etc/hosts etc/sysconfig/boot etc/sysconfig/firstboot etc/dat.conf etc/sysconfig/network/ifcfg* etc/infiniband etc/sysconfig/*config etc/security etc/opa-fm/opafm.xml etc/sysconfig/iview_fm.config var/log/fm* var/log/sm* var/log/bm* var/log/pm* var/log/fe* var/log/opensm* var/log/ipath* etc/rc.d/rc.local etc/modprobe.d boot/grub/menu.lst boot/grub/grub.conf boot/grub2/grub.cfg boot/grub2/grubenv boot/grub2/device.map etc/grub*.conf etc/udev* etc/opensm etc/sysconfig/opensm etc/rdma/* etc/modprobe.d/* etc/dracut.conf.d/* etc/nsswitch.conf etc/sysconfig/irqbalance
do
if [ -e "$f" ]
then
......@@ -508,7 +530,7 @@ then
done
fi
for f in usr/local/src/mpi_apps/core* usr/src/opa/mpi_apps/core* usr/src/opa/shmem_apps/core*
for f in usr/local/src/mpi_apps/core* usr/src/opa/mpi_apps/core* usr/src/opa/shmem_apps/core* usr/src/opa-mpi-apps/core*
do
if [ -e "$f" ]
then
......
......@@ -46,6 +46,8 @@ ln -s ./opasmaquery ${DESTDIR}/usr/sbin/opapmaquery
cd ../opasadb
cp -t ${DESTDIR}/usr/bin $opasadb_bin
cp -t ${DESTDIR}/usr/include/infiniband $opasadb_header
OPASADB_VERNO=$(awk '/^Version/ {print $2}' ${BUILDDIR}/opasadb/opasadb.spec)
OPASADB_VERNO_MAJOR=$(echo $OPASADB_VERNO | cut -d . -f 1)
cd ../opamgt
cp -t ${DESTDIR}/usr/include/opamgt $opamgt_headers
......@@ -53,6 +55,7 @@ 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=$(cat version)
OPAMGT_VERNO_MAJOR=$(cat version | cut -d . -f 1)
cd ../bin
......@@ -106,12 +109,16 @@ cp -t ${DESTDIR}/etc/opa opamon.conf opamon.si.conf
#Libraries installing
#cd ../builtlibs.OPENIB_FF.release
cd $(cat $BUILDDIR/LIB_PATH)
cp -t ${DESTDIR}/${DSAP_LIBDIR} libopasadb.so.*
ln -s libopasadb.so.* ${DESTDIR}/${DSAP_LIBDIR}/libopasadb.so.1
ln -s libopasadb.so.1 ${DESTDIR}/${DSAP_LIBDIR}/libopasadb.so
cp -t ${DESTDIR}/${DSAP_LIBDIR}/ibacm libdsap.so.*
cp -t ${DESTDIR}/usr/lib libopamgt.so.*
ln -s libopamgt.so.${OPAMGT_VERNO_MAJOR} ${DESTDIR}/usr/lib/libopamgt.so
mkdir -p ${DESTDIR}/${LIBDIR}
cp -t ${DESTDIR}/${LIBDIR} libopasadb.so.*
ln -s libopasadb.so.${OPASADB_VERNO} \
${DESTDIR}/${LIBDIR}/libopasadb.so.${OPASADB_VERNO_MAJOR}
ln -s libopasadb.so.${OPASADB_VERNO_MAJOR} ${DESTDIR}/${LIBDIR}/libopasadb.so
cp -t ${DESTDIR}/usr/lib/ibacm libdsap.so.*
cp -t ${DESTDIR}/${LIBDIR} libopamgt.so.*
ln -s libopamgt.so.${OPAMGT_VERNO} \
${DESTDIR}/${LIBDIR}/libopamgt.so.${OPAMGT_VERNO_MAJOR}
ln -s libopamgt.so.${OPAMGT_VERNO_MAJOR} ${DESTDIR}/${LIBDIR}/libopamgt.so
# Now that we've put everything in the buildroot, copy any default config files to their expected location for user
......
......@@ -386,7 +386,7 @@ void* omgt_oob_ssl_connect(struct omgt_port *port, void *context, int serverfd)
// is not presented by the server the connection will be rejected.
if (!(cert = SSL_get_peer_certificate(session))) {
status = OMGT_STATUS_NOT_FOUND;
OMGT_OUTPUT_ERROR(port, "server has no certifcate to verfiy\n");
OMGT_OUTPUT_ERROR(port, "server has no certificate to verify\n");
} else {
long result;
......
......@@ -219,7 +219,7 @@ OMGT_STATUS_T omgt_sa_get_notice_report(struct omgt_port *port, STL_NOTICE **not
/* Otherwise error */
} else {
SA_MAD *samad = (SA_MAD *)&packet->MadData.common;
OMGT_OUTPUT_ERROR(port, "Unexpected OOB MAD recieved: %s %s(%s)\n",
OMGT_OUTPUT_ERROR(port, "Unexpected OOB MAD received: %s %s(%s)\n",
stl_class_str(samad->common.BaseVersion, samad->common.MgmtClass),
stl_method_str(samad->common.BaseVersion, samad->common.MgmtClass, samad->common.mr.AsReg8),
stl_attribute_str(samad->common.BaseVersion, samad->common.MgmtClass, hton16(samad->common.AttributeID)));
......