pkgdep/centos: fix centos routines for installing the packages
Centos7: ndb package version update - version 3.14-2 of the nbd package is no longer available in epel repository. Updated for version 3.24-1. Centos8: repository URL change - old ceph repository has Centos version mismatch. Centos8: no need to install NBD package. It is available on the system by default. Signed-off-by: Kamil Godzwon <kamilx.godzwon@intel.com> Change-Id: Ifae0833822b270127b31fe95c14f6803f688bfc6 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12156 Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> 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:
parent
2bc134eb4b
commit
ac7b9b7c66
@ -48,7 +48,7 @@ if [[ $ID == centos || $ID == rhel ]]; then
|
|||||||
if [[ $VERSION_ID == 8* ]]; then
|
if [[ $VERSION_ID == 8* ]]; then
|
||||||
repos+=("https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm")
|
repos+=("https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm")
|
||||||
repos+=("https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm")
|
repos+=("https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm")
|
||||||
[[ $ID == centos ]] && repos+=("centos-release-ceph-nautilus.noarch")
|
[[ $ID == centos ]] && repos+=("https://download.ceph.com/rpm-nautilus/el8/noarch/ceph-release-1-1.el8.noarch.rpm")
|
||||||
# Add PowerTools needed for install CUnit-devel in Centos8
|
# Add PowerTools needed for install CUnit-devel in Centos8
|
||||||
if [[ $ID == centos ]]; then
|
if [[ $ID == centos ]]; then
|
||||||
is_repo "PowerTools" && enable+=("PowerTools")
|
is_repo "PowerTools" && enable+=("PowerTools")
|
||||||
|
@ -10,7 +10,9 @@ pre_install() {
|
|||||||
|
|
||||||
install nbd || {
|
install nbd || {
|
||||||
install wget
|
install wget
|
||||||
wget -O nbd.rpm https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/n/nbd-3.14-2.el7.x86_64.rpm
|
if [[ $ID == centos ]] && (( VERSION_ID == 7 )); then
|
||||||
|
wget -O nbd.rpm https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/n/nbd-3.24-1.el7.x86_64.rpm
|
||||||
install nbd.rpm
|
install nbd.rpm
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user