From 44ad025aaab1cde9725863e0eba7aa9bd314861a Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 5 Dec 2018 16:14:32 -0700 Subject: [PATCH] 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: Jim Harris Change-Id: I40c1659333cd80b54fb3e01ed036294aa5bf6ca3 Reviewed-on: https://review.gerrithub.io/436231 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Seth Howell Reviewed-by: Shuhei Matsumoto --- scripts/pkgdep.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pkgdep.sh b/scripts/pkgdep.sh index c99e76f91..2126227dc 100755 --- a/scripts/pkgdep.sh +++ b/scripts/pkgdep.sh @@ -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