Commit 44ad025a authored by Jim Harris's avatar Jim Harris
Browse files

pkgdep.sh: fix configshell installation on Ubuntu



Skip pip and just use apt-get install for configshell
and pexpect.  While here, don't try to install these
on older Ubuntu systems, since they aren't available
there.  We know they're available on 16.04, so skip
it for anything older than that.

Fixes issue #532.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I40c1659333cd80b54fb3e01ed036294aa5bf6ca3

Reviewed-on: https://review.gerrithub.io/436231


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 1500792f
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -86,10 +86,10 @@ elif [ -f /etc/debian_version ]; then
	apt-get install -y libnuma-dev nasm
	# Additional dependencies for building docs
	apt-get install -y doxygen mscgen graphviz
	# Additional dependencies for SPDK CLI
	apt-get install -y python-pip python3-pip
	pip install configshell_fb pexpect
	pip3 install configshell_fb pexpect
	# Additional dependencies for SPDK CLI - not available on older Ubuntus
	if [[ $(lsb_release -rs) > "16.01" ]]; then
		apt-get install -y python3-configshell-fb python3-pexpect
	fi
elif [ -f /etc/SuSE-release ]; then
	zypper install -y gcc gcc-c++ make cunit-devel libaio-devel libopenssl-devel \
		git-core lcov python-base python-pep8 libuuid-devel sg3_utils pciutils