d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I11b4bb2a0db20e6f86749cd951221a3697a72ed6
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4815
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@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 2020-10-22 01:54:09 +02:00 committed by Tomasz Zawadzki
parent 17f3add0a4
commit 22213bb777
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/common/config/pkgdep/apt-get
View File

@ -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=(

1
test/common/config/pkgdep/os/debian Symbolic link
View File

@ -0,0 +1 @@
ubuntu

22
test/common/config/pkgdep/os/ubuntu Normal file
View File

@ -0,0 +1,22 @@
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