Commit 54c7f8ff authored by Boris Glimcher's avatar Boris Glimcher Committed by Jim Harris
Browse files

scripts/pkgdep: always clone git repos 



this aligns all functions to the same code pattern
also fixed uadk_version for reproducability

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


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

scripts/pkgdep/common.sh

+9 −16
Original line number Diff line number Diff line
@@ -6,15 +6,12 @@ 
install_liburing() {

	local GIT_REPO_LIBURING=https://github.com/axboe/liburing.git

	local liburing_dir=/usr/local/src/liburing

	local liburing_version="liburing-2.2"



	if [[ -d $liburing_dir ]]; then

		echo "liburing source already present, not cloning"

	else

		mkdir -p $liburing_dir

		git clone "${GIT_REPO_LIBURING}" "$liburing_dir"

	fi

	rm -rf "$liburing_dir"

	# Use commit we know we can compile against. See #1673 as a reference.

	git -C "$liburing_dir" checkout liburing-2.2

	git clone --branch "${liburing_version}" "${GIT_REPO_LIBURING}" "${liburing_dir}"



	(cd "$liburing_dir" && ./configure --libdir=/usr/lib64 --libdevdir=/usr/lib64 && make install)

	echo /usr/lib64 > /etc/ld.so.conf.d/spdk-liburing.conf

	ldconfig -X
@@ -23,13 +20,11 @@ install_liburing() { 
install_uadk() {

	local GIT_REPO_UADK=https://github.com/Linaro/uadk

	local uadk_dir=/usr/local/src/uadk

	local uadk_version="v2.9.1"



	rm -rf "$uadk_dir"

	git clone --branch "${uadk_version}" "${GIT_REPO_UADK}" "${uadk_dir}"



	if [[ -d $uadk_dir ]]; then

		echo "uadk source already present, not cloning"

	else

		mkdir -p $uadk_dir

		git clone "${GIT_REPO_UADK}" "$uadk_dir"

	fi

	(cd "$uadk_dir" && ./cleanup.sh && ./autogen.sh && ./configure --libdir=/usr/lib64 && make install)

	echo /usr/lib64 > /etc/ld.so.conf.d/uadk.conf

	ldconfig
@@ -51,9 +46,7 @@ _install_shfmt() { 
	source /etc/opt/spdk-pkgdep/paths/export.sh > /dev/null



	rm -rf "$shfmt_dir"



	git clone "$shfmt_repo" "$shfmt_dir"

	git -C "$shfmt_dir" checkout "$version"

	git clone --branch "$version" "$shfmt_repo" "$shfmt_dir"



	# See cmd/shfmt/Dockerfile

	CGO_ENABLED=0 go -C "$shfmt_dir" build \