pkgdep/ubuntu: Include packaged version of meson

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Ib6bff3b5d77d5cc0a08d11e9608c10bf0e4d119f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6412
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Michal Berger 2021-02-15 10:02:50 +01:00 committed by Tomasz Zawadzki
parent a1ae47f34f
commit 62ab898c8f

View File

@ -6,7 +6,12 @@ VERSION_ID_NUM=$(sed 's/\.//g' <<< $VERSION_ID)
apt-get install -y gcc g++ make cmake libcunit1-dev libaio-dev libssl-dev libjson-c-dev libcmocka-dev \ apt-get install -y gcc g++ make cmake libcunit1-dev libaio-dev libssl-dev libjson-c-dev libcmocka-dev \
uuid-dev libiscsi-dev python libncurses5-dev libncursesw5-dev python3-pip uuid-dev libiscsi-dev python libncurses5-dev libncursesw5-dev python3-pip
pip3 install ninja pip3 install ninja
pip3 install meson if ! pip3 install meson; then
# After recent updates pip3 on ubuntu1604 provides meson version which requires python >= 3.6.
# Unfortunately, the latest available version of python3 there is 3.5.2. In case pip3 fails to
# install meson fallback to packaged version of it ubuntu1604's repos may provide.
apt-get install -y meson
fi
pip3 install pyelftools pip3 install pyelftools
# 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 \