Commit 22213bb7 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/apt-get: Move ubuntu-dependent checks to os/ubuntu 



Change-Id: I11b4bb2a0db20e6f86749cd951221a3697a72ed6
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4815


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 17f3add0

test/common/config/pkgdep/apt-get

+0 −22
Original line number Diff line number Diff line
@@ -34,28 +34,6 @@ pre_install() { 
		install libasan2

		install libubsan0

	fi

	if ! install rdma-core; then

		echo "Package rdma-core is avaliable at Ubuntu 18 [universe] repositorium" >&2

	fi

	if ! install libpmempool1; then

		echo "Package libpmempool1 is available at Ubuntu 18 [universe] repositorium" >&2

	fi

	if ! install clang-tools; then

		echo "Package clang-tools is available at Ubuntu 18 [universe] repositorium" >&2

	fi

	if ! install --no-install-suggests --no-install-recommends open-isns-utils; then

		echo "Package open-isns-utils is available at Ubuntu 18 [universe] repositorium" >&2

	fi



	# Package name for Ubuntu 18 is targetcli-fb but for Ubuntu 16 it's targetcli

	if ! install targetcli-fb; then

		install targetcli

	fi



	# On Ubuntu 20.04 (focal) btrfs-tools are available under different name - btrfs-progs

	if ! install btrfs-tools; then

		install btrfs-progs

	fi

}



packages=(

test/common/config/pkgdep/os/debian

0 → 120000
+1 −0
Original line number Diff line number Diff line 
ubuntu
 
 No newline at end of file

test/common/config/pkgdep/os/ubuntu

0 → 100644
+22 −0
Original line number Diff line number Diff line 
case "$VERSION_CODENAME" in

	xenial) # 16.04

		packages+=(btrfs-tools)

		packages+=(targetcli)

		;;

	*)

		packages+=(

			rdma-core

			libpmempool1

			clang-tools

			targetcli-fb

			open-isns-utils

		)



		if [[ $VERSION_CODENAME == bionic ]]; then

			packages+=(btrfs-tools)

		else

			# On Ubuntu 20.04 (focal) btrfs-tools are available under different name - btrfs-progs

			packages+=(btrfs-progs)

		fi

		;;

esac