Commit 8d7f1929 authored by Boris Glimcher's avatar Boris Glimcher Committed by Tomasz Zawadzki
Browse files

scripts/pkgdep: centos 9/10 renamed "extras" to "extras-common" 



While centos:8 and all rocky is still the same name "extras".

```
root@spdk:~# docker run --rm -it rockylinux/rockylinux:9 yum repolist all | grep -i extras
extras                     Rocky Linux 9 - Extras                       enabled

root@spdk:~# docker run --rm -it quay.io/centos/centos:8 yum repolist all | grep -i extras
extras           CentOS Linux 8 - Extras                                enabled

root@spdk:~# docker run --rm -it quay.io/centos/centos:9 yum repolist all | grep -i extras
extras-common              CentOS Stream 9 - Extras packages            enabled
```

Change-Id: I6dfff89346f88842220abab7abdd7cf104f108d8
Signed-off-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26532


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarMichal Berger <michal.berger@nutanix.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent ecec6309

scripts/pkgdep/rhel.sh

+4 −3
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ disclaimer 
# on the enterprise systems, like RHEL.

if [[ $ID == centos || $ID == rhel || $ID == rocky ]]; then

	repos=() enable=("epel" "elrepo" "elrepo-testing") add=()

	[[ $ID == centos || $ID == rocky ]] && enable+=("extras")



	if [[ $VERSION_ID == 7* ]]; then

		printf 'Not supported distribution detected (%s):(%s), aborting\n' "$ID" "$VERSION_ID" >&2

		exit 1
@@ -52,18 +50,21 @@ if [[ $ID == centos || $ID == rhel || $ID == rocky ]]; then 
		repos+=("https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm")

		add+=("https://packages.daos.io/v2.0/EL8/packages/x86_64/daos_packages.repo")

		enable+=("daos-packages")

		[[ $ID == centos ]] && enable+=("extras")

	fi



	if [[ $VERSION_ID == 9* ]]; then

		repos+=("https://www.elrepo.org/elrepo-release-9.el9.elrepo.noarch.rpm")

		repos+=("https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm")

		[[ $ID != rhel ]] && enable+=("crb")

		[[ $ID == centos ]] && enable+=("extras-common")

	fi



	if [[ $VERSION_ID == 10* ]]; then

		repos+=("https://www.elrepo.org/elrepo-release-10.el10.elrepo.noarch.rpm")

		repos+=("https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm")

		[[ $ID != rhel ]] && enable+=("crb")

		[[ $ID == centos ]] && enable+=("extras-common")

	fi



	# Add PowerTools needed for install CUnit-devel
@@ -78,7 +79,7 @@ if [[ $ID == centos || $ID == rhel || $ID == rocky ]]; then 
	[[ $ID == rhel && $VERSION_ID == 9* ]] && repos+=("https://download.ceph.com/rpm-reef/el9/noarch/ceph-release-1-1.el9.noarch.rpm")



	if [[ $ID == rocky ]]; then

		enable+=("devel")

		enable+=("devel" "extras")

	fi



	if ((${#add[@]} > 0)); then