From 738cdf143f9342a70cf1a724dcadc93d417beb3c Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 26 Jan 2021 15:45:32 +0100 Subject: [PATCH] scripts/pkgdep.sh: install pyelftools for DPDK Recent builds with mainline DPDK failed due to missing python dependency "elftools". This patch adds it to our system provisioning scripts. Fixes #1770 Signed-off-by: Karol Latecki Change-Id: I9e3879d9bddd64bb0f7be81120e5fadebefa9eb8 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6103 Reviewed-by: Michal Berger Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker Reviewed-by: Monica Kenguva Reviewed-by: Paul Luse Reviewed-by: Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot --- scripts/pkgdep/arch.sh | 1 + scripts/pkgdep/clear-linux-os.sh | 1 + scripts/pkgdep/debian.sh | 1 + scripts/pkgdep/freebsd.sh | 2 +- scripts/pkgdep/rhel.sh | 1 + scripts/pkgdep/sles.sh | 3 ++- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/pkgdep/arch.sh b/scripts/pkgdep/arch.sh index aba0ec2f2..d625ee816 100755 --- a/scripts/pkgdep/arch.sh +++ b/scripts/pkgdep/arch.sh @@ -6,6 +6,7 @@ pacman -Sy --needed --noconfirm gcc make cmake cunit libaio openssl \ # Additional dependencies for SPDK CLI pacman -Sy --needed --noconfirm python-pexpect python-pip libffi pip install configshell_fb +pip install pyelftools # Additional dependencies for DPDK pacman -Sy --needed --noconfirm numactl nasm # Additional dependencies for ISA-L used in compression diff --git a/scripts/pkgdep/clear-linux-os.sh b/scripts/pkgdep/clear-linux-os.sh index 0d7ec130e..d06dd6af0 100755 --- a/scripts/pkgdep/clear-linux-os.sh +++ b/scripts/pkgdep/clear-linux-os.sh @@ -11,6 +11,7 @@ swupd bundle-add -y nasm sysadmin-basic # Additional dependencies for SPDK CLI pip3 install pexpect pip3 install configshell_fb +pip3 install pyelftools if [[ $INSTALL_DEV_TOOLS == "true" ]]; then swupd bundle-add -y git os-testsuite-0day fi diff --git a/scripts/pkgdep/debian.sh b/scripts/pkgdep/debian.sh index 25dd863cf..4a9211d04 100755 --- a/scripts/pkgdep/debian.sh +++ b/scripts/pkgdep/debian.sh @@ -7,6 +7,7 @@ apt-get install -y gcc g++ make cmake libcunit1-dev libaio-dev libssl-dev libjso uuid-dev libiscsi-dev python libncurses5-dev libncursesw5-dev python3-pip pip3 install ninja pip3 install meson +pip3 install pyelftools # Additional dependencies for SPDK CLI - not available on older Ubuntus apt-get install -y python3-configshell-fb python3-pexpect || echo \ "Note: Some SPDK CLI dependencies could not be installed." diff --git a/scripts/pkgdep/freebsd.sh b/scripts/pkgdep/freebsd.sh index e7cf64277..aafce044b 100755 --- a/scripts/pkgdep/freebsd.sh +++ b/scripts/pkgdep/freebsd.sh @@ -2,7 +2,7 @@ # Minimal install pkg install -y gmake cunit openssl git bash misc/e2fsprogs-libuuid python \ - ncurses ninja meson + ncurses ninja meson py37-pyelftools-0.26 # Additional dependencies for ISA-L used in compression pkg install -y autoconf automake libtool help2man if [[ $INSTALL_DEV_TOOLS == "true" ]]; then diff --git a/scripts/pkgdep/rhel.sh b/scripts/pkgdep/rhel.sh index df746c6e8..b2be71b67 100755 --- a/scripts/pkgdep/rhel.sh +++ b/scripts/pkgdep/rhel.sh @@ -94,6 +94,7 @@ fi yum install -y python3-pip pip3 install ninja pip3 install meson +pip3 install pyelftools # Additional dependencies for SPDK CLI - not available in rhel and centos if ! echo "$ID $VERSION_ID" | grep -E -q 'rhel 7|centos 7'; then diff --git a/scripts/pkgdep/sles.sh b/scripts/pkgdep/sles.sh index bb03f0e04..14cb14cb0 100755 --- a/scripts/pkgdep/sles.sh +++ b/scripts/pkgdep/sles.sh @@ -2,7 +2,8 @@ # Minimal install zypper install -y gcc gcc-c++ make cmake cunit-devel libaio-devel libopenssl-devel \ - libuuid-devel python-base ncurses-devel json-c-devel libcmocka-devel ninja meson + libuuid-devel python-base ncurses-devel json-c-devel libcmocka-devel ninja meson \ + python-pyelftools # Additional dependencies for DPDK zypper install -y libnuma-devel nasm # Additional dependencies for ISA-L used in compression