ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgdep.sh: fix configshell installation on Ubuntu

Browse Source 
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: Jim Harris <james.r.harris@intel.com>
Change-Id: I40c1659333cd80b54fb3e01ed036294aa5bf6ca3

Reviewed-on: https://review.gerrithub.io/436231
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2018-12-05 16:14:32 -07:00
parent 1500792f52
commit 44ad025aaa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/pkgdep.sh
View File

@ -86,10 +86,10 @@ elif [ -f /etc/debian_version ]; then
apt-get install -y libnuma-dev nasm apt-get install -y libnuma-dev nasm
# Additional dependencies for building docs # Additional dependencies for building docs
apt-get install -y doxygen mscgen graphviz apt-get install -y doxygen mscgen graphviz
# Additional dependencies for SPDK CLI # Additional dependencies for SPDK CLI - not available on older Ubuntus
apt-get install -y python-pip python3-pip if [[ $(lsb_release -rs) > "16.01" ]]; then
pip install configshell_fb pexpect apt-get install -y python3-configshell-fb python3-pexpect
pip3 install configshell_fb pexpect fi
elif [ -f /etc/SuSE-release ]; then elif [ -f /etc/SuSE-release ]; then
zypper install -y gcc gcc-c++ make cunit-devel libaio-devel libopenssl-devel \ 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 git-core lcov python-base python-pep8 libuuid-devel sg3_utils pciutils