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

pkgdep/rhel: Make sure pip3 is installed in first instance

Browse Source 
There was a code that attempted to to use pip3 before we try to
actually install it. Change the order.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: I5dc74b79b3adf132589bbf9ef10360d2eeed51ba
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15293
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2022-11-06 14:57:25 +01:00 committed by Tomasz Zawadzki
parent 71605a520d
commit b35a6f39a6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/pkgdep/rhel.sh
View File

@ -67,6 +67,10 @@ if [[ $ID == centos || $ID == rhel || $ID == rocky ]]; then
fi fi
fi fi
yum install -y gcc gcc-c++ make CUnit-devel libaio-devel openssl-devel \
libuuid-devel libiscsi-devel ncurses-devel json-c-devel libcmocka-devel \
clang clang-devel python3-pip
# Minimal install # Minimal install
# workaround for arm: ninja fails with dep on skbuild python module # workaround for arm: ninja fails with dep on skbuild python module
if [ "$(uname -m)" = "aarch64" ]; then if [ "$(uname -m)" = "aarch64" ]; then
@ -82,10 +86,6 @@ if [ "$(uname -m)" = "aarch64" ]; then
fi fi
fi fi
yum install -y gcc gcc-c++ make CUnit-devel libaio-devel openssl-devel \
libuuid-devel libiscsi-devel ncurses-devel json-c-devel libcmocka-devel \
clang clang-devel
# for rhel and centos7 OpenSSL 1.1 should be installed via EPEL # for rhel and centos7 OpenSSL 1.1 should be installed via EPEL
if echo "$ID $VERSION_ID" | grep -E -q 'centos 7|rhel 7'; then if echo "$ID $VERSION_ID" | grep -E -q 'centos 7|rhel 7'; then
yum install -y openssl11-devel yum install -y openssl11-devel
@ -99,7 +99,6 @@ if echo "$ID $VERSION_ID" | grep -E -q 'centos 8|rhel 8|rocky 8'; then
else else
yum install -y python python3-devel yum install -y python python3-devel
fi fi
yum install -y python3-pip
pip3 install ninja pip3 install ninja
pip3 install meson pip3 install meson
pip3 install pyelftools pip3 install pyelftools