Commit 62ab898c authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/ubuntu: Include packaged version of meson



Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: Ib6bff3b5d77d5cc0a08d11e9608c10bf0e4d119f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6412


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent a1ae47f3
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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 \
	uuid-dev libiscsi-dev python libncurses5-dev libncursesw5-dev python3-pip
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
# Additional dependencies for SPDK CLI - not available on older Ubuntus
apt-get install -y python3-configshell-fb python3-pexpect || echo \