From 62ab898c8ff3fc0e7d64f5f8548bae230d653a41 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Mon, 15 Feb 2021 10:02:50 +0100 Subject: [PATCH] pkgdep/ubuntu: Include packaged version of meson Signed-off-by: Michal Berger Change-Id: Ib6bff3b5d77d5cc0a08d11e9608c10bf0e4d119f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6412 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- scripts/pkgdep/debian.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/pkgdep/debian.sh b/scripts/pkgdep/debian.sh index 4a9211d04..ee92da747 100755 --- a/scripts/pkgdep/debian.sh +++ b/scripts/pkgdep/debian.sh @@ -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 \