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

scripts/pkgdep: Add ninja and meson packages to minimal install option

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I36cba747313349f9dbe9d98e6e6297e1a449af3f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2517
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Maciej Wawryk 2020-05-19 10:52:46 +02:00 committed by Tomasz Zawadzki
parent 76aed8e4ff
commit e96d3280a0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/pkgdep.sh
View File

@ -135,6 +135,9 @@ if [ -s /etc/redhat-release ]; then
else else
yum install -y python yum install -y python
fi fi
yum install -y python3-pip
pip-3.6 install ninja
pip-3.6 install meson
# Additional dependencies for SPDK CLI - not available in rhel and centos # Additional dependencies for SPDK CLI - not available in rhel and centos
if ! echo "$ID $VERSION_ID" | grep -E -q 'rhel 7|centos 7'; then if ! echo "$ID $VERSION_ID" | grep -E -q 'rhel 7|centos 7'; then
yum install -y python3-configshell python3-pexpect yum install -y python3-configshell python3-pexpect
@ -192,7 +195,9 @@ elif [ -f /etc/debian_version ]; then
# Includes Ubuntu, Debian # Includes Ubuntu, Debian
# Minimal install # Minimal install
apt-get install -y gcc g++ make libcunit1-dev libaio-dev libssl-dev \ apt-get install -y gcc g++ make libcunit1-dev libaio-dev libssl-dev \
uuid-dev libiscsi-dev python libncurses5-dev libncursesw5-dev uuid-dev libiscsi-dev python libncurses5-dev libncursesw5-dev python3-pip
pip3 install ninja
pip3 install meson
# Additional dependencies for SPDK CLI - not available on older Ubuntus # Additional dependencies for SPDK CLI - not available on older Ubuntus
apt-get install -y python3-configshell-fb python3-pexpect || echo \ apt-get install -y python3-configshell-fb python3-pexpect || echo \
"Note: Some SPDK CLI dependencies could not be installed." "Note: Some SPDK CLI dependencies could not be installed."
@ -244,7 +249,7 @@ elif [ -f /etc/debian_version ]; then
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then
# Minimal install # Minimal install
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 \
libuuid-devel python-base ncurses-devel libuuid-devel python-base ncurses-devel ninja meson
# Additional dependencies for DPDK # Additional dependencies for DPDK
zypper install -y libnuma-devel nasm zypper install -y libnuma-devel nasm
# Additional dependencies for ISA-L used in compression # Additional dependencies for ISA-L used in compression
@ -276,7 +281,7 @@ elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then
elif [ $(uname -s) = "FreeBSD" ]; then elif [ $(uname -s) = "FreeBSD" ]; then
# Minimal install # Minimal install
pkg install -y gmake cunit openssl git bash misc/e2fsprogs-libuuid python \ pkg install -y gmake cunit openssl git bash misc/e2fsprogs-libuuid python \
ncurses ncurses ninja meson
# Additional dependencies for ISA-L used in compression # Additional dependencies for ISA-L used in compression
pkg install -y autoconf automake libtool help2man pkg install -y autoconf automake libtool help2man
if [[ $INSTALL_DEV_TOOLS == "true" ]]; then if [[ $INSTALL_DEV_TOOLS == "true" ]]; then
@ -292,7 +297,7 @@ elif [ $(uname -s) = "FreeBSD" ]; then
elif [ -f /etc/arch-release ]; then elif [ -f /etc/arch-release ]; then
# Install main dependencies # Install main dependencies
pacman -Sy --needed --noconfirm gcc make cunit libaio openssl \ pacman -Sy --needed --noconfirm gcc make cunit libaio openssl \
libutil-linux libiscsi python ncurses libutil-linux libiscsi python ncurses ninja meson
# Additional dependencies for SPDK CLI # Additional dependencies for SPDK CLI
pacman -Sy --needed --noconfirm python-pexpect python-pip pacman -Sy --needed --noconfirm python-pexpect python-pip
pip install configshell_fb pip install configshell_fb