Commit b6770c73 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

pkgdep: minor fixes 



CHange double brackets to single brackets for compatibility with
freebsd, also added -y to a pkgdep call to avoid the script hanging when
called programmatically.

Change-Id: I9a851005efae77b9146f14cac8079e2d448143d4
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/423936


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent e0fc53f7

scripts/pkgdep.sh

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ elif [ -f /etc/debian_version ]; then 
	apt-get install -y gcc g++ make libcunit1-dev libaio-dev libssl-dev \

		git astyle pep8 lcov clang uuid-dev sg3-utils libiscsi-dev pciutils

	# Additional (optional) dependencies for showing backtrace in logs

	apt-get install libunwind-dev

	apt-get install -y libunwind-dev

	# Additional dependencies for NVMe over Fabrics

	apt-get install -y libibverbs-dev librdmacm-dev

	# Additional dependencies for DPDK
@@ -69,13 +69,13 @@ fi 
# Only crypto needs nasm and this lib but because the lib requires root to

# install we do it here.

nasm_ver=$(nasm -v | sed 's/[^0-9]*//g' | awk '{print substr ($0, 0, 5)}')

if [[ $nasm_ver -lt "21202" ]]; then

if [ $nasm_ver -lt "21202" ]; then

		echo Crypto requires NASM version 2.12.02 or newer.  Please install

		echo or upgrade and re-run this script if you are going to use Crypto.

else

	ipsec="$(find /usr -name intel-ipsec-mb.h 2>/dev/null)"

	if [[ "$ipsec" == "" ]]; then

		if [[ -d "$rootdir/intel-ipsec-mb" ]]; then

	if [ "$ipsec" == "" ]; then

		if [ -d "$rootdir/intel-ipsec-mb" ]; then

			cd $rootdir/intel-ipsec-mb

			make

			make install