Commit 34bc24f1 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

pkgdep: add avahi package dependencies 



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

Signed-off-by: default avatarParameswaran Krishnamurthy <parameswaran.krishna@dell.com>
Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ic8de8e463b07b5b9d260781175d117766acdab9e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16254


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent cec20de8

scripts/pkgdep.sh

+7 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#  SPDX-License-Identifier: BSD-3-Clause

#  Copyright (C) 2017 Intel Corporation

#  All rights reserved.

#  Copyright (c) 2022 Dell Inc, or its subsidiaries.

#

# Please run this script as root.
@@ -23,6 +24,7 @@ function usage() { 
	echo "  -b --docs                   Additional dependencies for building docs"

	echo "  -u --uring                  Additional dependencies for io_uring"

	echo "  -D --daos                   Additional dependencies for DAOS"

	echo "  -A --avahi                  Additional dependencies for Avahi mDNS Discovery"

	echo ""

	exit 0

}
@@ -36,6 +38,7 @@ function install_all_dependencies() { 
	INSTALL_DOCS=true

	INSTALL_LIBURING=true

	INSTALL_DAOS=true

	INSTALL_AVAHI=true

}



INSTALL_CRYPTO=false
@@ -47,8 +50,9 @@ INSTALL_RDMA=false 
INSTALL_DOCS=false

INSTALL_LIBURING=false

INSTALL_DAOS=false

INSTALL_AVAHI=false



while getopts 'abdfhipruDR-:' optchar; do

while getopts 'abdfhipruADR-:' optchar; do

	case "$optchar" in

		-)

			case "$OPTARG" in
@@ -62,6 +66,7 @@ while getopts 'abdfhipruDR-:' optchar; do 
				docs) INSTALL_DOCS=true ;;

				uring) INSTALL_LIBURING=true ;;

				daos) INSTALL_DAOS=true ;;

				avahi) INSTALL_AVAHI=true ;;

				*)

					echo "Invalid argument '$OPTARG'"

					usage
@@ -78,6 +83,7 @@ while getopts 'abdfhipruDR-:' optchar; do 
		b) INSTALL_DOCS=true ;;

		u) INSTALL_LIBURING=true ;;

		D) INSTALL_DAOS=true ;;

		A) INSTALL_AVAHI=true ;;

		*)

			echo "Invalid argument '$OPTARG'"

			usage

scripts/pkgdep/debian.sh

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#  Copyright (C) 2020 Intel Corporation

#  Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.

#  All rights reserved.

#  Copyright (c) 2022 Dell Inc, or its subsidiaries.

#



VERSION_ID_NUM=$(sed 's/\.//g' <<< $VERSION_ID)
@@ -83,3 +84,8 @@ if [[ $INSTALL_DOCS == "true" ]]; then 
	# Additional dependencies for building docs

	apt-get install -y doxygen mscgen graphviz

fi

# Additional dependencies for Avahi

if [[ $INSTALL_AVAHI == "true" ]]; then

	# Additional dependencies for Avahi

	apt-get install -y libavahi-client-dev

fi

scripts/pkgdep/rhel.sh

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#  SPDX-License-Identifier: BSD-3-Clause

#  Copyright (C) 2020 Intel Corporation

#  All rights reserved.

#  Copyright (c) 2022 Dell Inc, or its subsidiaries.

#



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"

	fi

fi

# Additional dependencies for Avahi

if [[ $INSTALL_AVAHI == "true" ]]; then

	# Additional dependencies for Avahi

	yum install -y avahi-devel

fi

scripts/pkgdep/sles.sh

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#  SPDX-License-Identifier: BSD-3-Clause

#  Copyright (C) 2020 Intel Corporation

#  All rights reserved.

#  Copyright (c) 2022 Dell Inc, or its subsidiaries.

#

# Minimal install

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 install -y daos-client daos-devel

fi

if [[ $INSTALL_AVAHI == "true" ]]; then

	# Additional dependencies for Avahi

	zypper install -y avahi-devel

fi