pkgdep: add avahi package dependencies

This will enable NVMe mDNS discovery implementation
and testing in future patches.

Signed-off-by: Parameswaran Krishnamurthy <parameswaran.krishna@dell.com>
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ic8de8e463b07b5b9d260781175d117766acdab9e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16254
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Boris Glimcher <Boris.Glimcher@emc.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2023-01-11 07:24:19 +00:00 committed by Tomasz Zawadzki
parent cec20de824
commit 34bc24f10f
4 changed files with 24 additions and 1 deletions

View File

@ -2,6 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright (C) 2017 Intel Corporation # Copyright (C) 2017 Intel Corporation
# All rights reserved. # All rights reserved.
# Copyright (c) 2022 Dell Inc, or its subsidiaries.
# #
# Please run this script as root. # Please run this script as root.
@ -23,6 +24,7 @@ function usage() {
echo " -b --docs Additional dependencies for building docs" echo " -b --docs Additional dependencies for building docs"
echo " -u --uring Additional dependencies for io_uring" echo " -u --uring Additional dependencies for io_uring"
echo " -D --daos Additional dependencies for DAOS" echo " -D --daos Additional dependencies for DAOS"
echo " -A --avahi Additional dependencies for Avahi mDNS Discovery"
echo "" echo ""
exit 0 exit 0
} }
@ -36,6 +38,7 @@ function install_all_dependencies() {
INSTALL_DOCS=true INSTALL_DOCS=true
INSTALL_LIBURING=true INSTALL_LIBURING=true
INSTALL_DAOS=true INSTALL_DAOS=true
INSTALL_AVAHI=true
} }
INSTALL_CRYPTO=false INSTALL_CRYPTO=false
@ -47,8 +50,9 @@ INSTALL_RDMA=false
INSTALL_DOCS=false INSTALL_DOCS=false
INSTALL_LIBURING=false INSTALL_LIBURING=false
INSTALL_DAOS=false INSTALL_DAOS=false
INSTALL_AVAHI=false
while getopts 'abdfhipruDR-:' optchar; do while getopts 'abdfhipruADR-:' optchar; do
case "$optchar" in case "$optchar" in
-) -)
case "$OPTARG" in case "$OPTARG" in
@ -62,6 +66,7 @@ while getopts 'abdfhipruDR-:' optchar; do
docs) INSTALL_DOCS=true ;; docs) INSTALL_DOCS=true ;;
uring) INSTALL_LIBURING=true ;; uring) INSTALL_LIBURING=true ;;
daos) INSTALL_DAOS=true ;; daos) INSTALL_DAOS=true ;;
avahi) INSTALL_AVAHI=true ;;
*) *)
echo "Invalid argument '$OPTARG'" echo "Invalid argument '$OPTARG'"
usage usage
@ -78,6 +83,7 @@ while getopts 'abdfhipruDR-:' optchar; do
b) INSTALL_DOCS=true ;; b) INSTALL_DOCS=true ;;
u) INSTALL_LIBURING=true ;; u) INSTALL_LIBURING=true ;;
D) INSTALL_DAOS=true ;; D) INSTALL_DAOS=true ;;
A) INSTALL_AVAHI=true ;;
*) *)
echo "Invalid argument '$OPTARG'" echo "Invalid argument '$OPTARG'"
usage usage

View File

@ -3,6 +3,7 @@
# Copyright (C) 2020 Intel Corporation # Copyright (C) 2020 Intel Corporation
# Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. # Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
# All rights reserved. # All rights reserved.
# Copyright (c) 2022 Dell Inc, or its subsidiaries.
# #
VERSION_ID_NUM=$(sed 's/\.//g' <<< $VERSION_ID) VERSION_ID_NUM=$(sed 's/\.//g' <<< $VERSION_ID)
@ -83,3 +84,8 @@ if [[ $INSTALL_DOCS == "true" ]]; then
# Additional dependencies for building docs # Additional dependencies for building docs
apt-get install -y doxygen mscgen graphviz apt-get install -y doxygen mscgen graphviz
fi fi
# Additional dependencies for Avahi
if [[ $INSTALL_AVAHI == "true" ]]; then
# Additional dependencies for Avahi
apt-get install -y libavahi-client-dev
fi

View File

@ -2,6 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright (C) 2020 Intel Corporation # Copyright (C) 2020 Intel Corporation
# All rights reserved. # All rights reserved.
# Copyright (c) 2022 Dell Inc, or its subsidiaries.
# #
disclaimer() { disclaimer() {
@ -182,3 +183,8 @@ if [[ $INSTALL_DAOS == "true" ]]; then
echo "Skipping installation of DAOS bdev dependencies. It is supported only for CentOS 7, CentOS 8 and Rocky 8" echo "Skipping installation of DAOS bdev dependencies. It is supported only for CentOS 7, CentOS 8 and Rocky 8"
fi fi
fi fi
# Additional dependencies for Avahi
if [[ $INSTALL_AVAHI == "true" ]]; then
# Additional dependencies for Avahi
yum install -y avahi-devel
fi

View File

@ -2,6 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright (C) 2020 Intel Corporation # Copyright (C) 2020 Intel Corporation
# All rights reserved. # All rights reserved.
# Copyright (c) 2022 Dell Inc, or its subsidiaries.
# #
# Minimal install # Minimal install
zypper install -y gcc gcc-c++ make cunit-devel libaio-devel libopenssl-devel \ zypper install -y gcc gcc-c++ make cunit-devel libaio-devel libopenssl-devel \
@ -43,3 +44,7 @@ if [[ $INSTALL_DAOS == "true" ]]; then
zypper --non-interactive refresh zypper --non-interactive refresh
zypper install -y daos-client daos-devel zypper install -y daos-client daos-devel
fi fi
if [[ $INSTALL_AVAHI == "true" ]]; then
# Additional dependencies for Avahi
zypper install -y avahi-devel
fi