From b35a6f39a6878325c971b95d94ecd79825e656e7 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Sun, 6 Nov 2022 14:57:25 +0100 Subject: [PATCH] pkgdep/rhel: Make sure pip3 is installed in first instance 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 Change-Id: I5dc74b79b3adf132589bbf9ef10360d2eeed51ba Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15293 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Karol Latecki Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris --- scripts/pkgdep/rhel.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/pkgdep/rhel.sh b/scripts/pkgdep/rhel.sh index 8e7fe5b7b..a8a5ac036 100755 --- a/scripts/pkgdep/rhel.sh +++ b/scripts/pkgdep/rhel.sh @@ -67,6 +67,10 @@ if [[ $ID == centos || $ID == rhel || $ID == rocky ]]; then 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 # workaround for arm: ninja fails with dep on skbuild python module if [ "$(uname -m)" = "aarch64" ]; then @@ -82,10 +86,6 @@ if [ "$(uname -m)" = "aarch64" ]; then 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 if echo "$ID $VERSION_ID" | grep -E -q 'centos 7|rhel 7'; then 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 yum install -y python python3-devel fi -yum install -y python3-pip pip3 install ninja pip3 install meson pip3 install pyelftools